When you click on links to various merchants on this site and make a purchase, this can result in this site earning a commission. Affiliate programs and affiliations include, but are not limited to, the eBay Partner Network.
Strip the Wax w/ Dawn (Dish) + Water.
Rewash it.
Dry panel by panel, I don't know about anyone else, but I just get rid of water spots by rewashing the area / panel.
I once had a black car where the water marks seemed to be etched into the paint. I found a clay bar removed all the water marks and left a very smooth surface. After a good polish and wax the car looked amazing!