Hi .... one thing I have used is Zaino PC Fusion ... it has worked well for most water spots. If the problem is really, really bad then I would go into a conventional rubbing compound and an orange pad .... but I try to be real careful. I use a Porter Cable 7424. I have used 3M "heavy cut" and...