The Poorboy's SSR2.5 is an awesome swirl remover and if you are careful to keep buffing with it until most of the polish residue had gone then you would probably be able to straight from the SSR2.5 to the EX-P or wax.