If they're etched in, you'll have to compound them out. Once they're out, I've had the best luck with acrylics (Klasse, Werkstat) in preventing recurrence. In particular, I've been amazed at the ability of Werkstat Acrylic Glos spray to remove water spots that are just forming. I compared it against every other product in my arsenal and it was by far the best.