^Try using claybar to take car of the over-spray.
As for wax, i am using Klasse all in one, followed by some regular carnuba based wax to top it. Works pretty well, i get the protection from the klasse and the shine from the wax.
I would love to actually polish the car but since it sleeps...