I have a friend who does detail, is very good at it as well, and he uses a diluted mixture of muratic acic to remove water spots. You have to be very carefull as to know when to rinse it off the paint, you can leave it on the glass a little longer, and then a ... Login to read more.