Geoff the best thing to get the water spots off is 50% vinegar and 50% water dont scrub just put it on wipe it on with a rag and wipe for a couple of minutes the spots are gone...
then use a wax afterwards

Geoff meet us in vegas and i will bring you a sealant that you would love......ask diam Dave and Shaky....they both have it on their cars and love it....
and oooogh by the way i am not trying to sell you anything ...

good luck Joani