You might polish the car with carpro essence. It says that it you can use it over coating.
http://www.autogeek.net/carpro-essence-xtreme.html
Wax will cause spots. I would run as far away as I could from the guy that told you to acid wash the car
But yeah, once you do a rinseless you will be amazed. Here is the Mother of all rinseless threads:
http://www.camaro6.com/forums/showthread.php?t=435828