I'd stick with Singapore, do selections from the CWP to supplement, and use curriculum compacting. You can use the end of section exercises as pretests, and throw in a smattering of review questions to keep his calculation skills sharp without excessive drill. By compacting you can go faster but still find and plug holes.

Striving to increase my rate of flow, and fight forum gloopiness. sick