Well, waxing probably did nothing because all it did was go on top of all of the imperfections. You should definitely go over the entire car with a clay bar. If you can get your hands on a buffer, use it. Zaino does have some good products, and they have the Z-PC fusion paint cleaner that should knock out the water spots and reduce the swirls. It can be done by hand as well, but will be better if you use a buffer. Everything that you do pre-wax is really what makes the difference, and after that, most waxes will look great.