Sure, your plan sounds great. Just one reminder though: If you are taking AP Physics C, the class only focuses on Mech and E&M so you will have to self-study the other topics like waves, light, etc. If you are taking AP Physics B, your good to go.
I figured just studying hard for the AP tests [and maybe taking a few SAT II practice tests and a prep book for Math II] would be prep enough for the SAT II ones.