Protecting auto glass from hard water spots?

I just got a new car and our water is very hard. I washed and dried the car, but the next morning, it was covered in water spots. I got the spots off the body by waxing the car. I tried an auto glass cleaner and it helped getting the spots off, but some are still visible.
Is there something I can do to get the spots off?
And, is there something I can put on the glass to keep them from forming so bad?

(We are looking into a water softener, so that will help in the future)

Anonymous2015-04-14T14:17:06Z

Try using a car shampoo such as "Meguiars NXT generation cash wash" which has water softeners included and it suds up really well even in hard water areas. I use it and it's great but it doesn't contain any wax so you will have to apply that afterwards. Ensure you use cold water and not warm as warm water makes the limescale in hard water stick...which causes water spots

Also avoid washing in sunlight as that increases the chance of water spots.

Just the guy next door2015-02-14T10:59:48Z

Try some white vinegar mixed with your glass cleaner. It tends to dissolve water spots. I use it all the time in my dishwasher to prevent spots. Afterward, use something like Rain-X, which puts a protective layer on the glass that helps water bead up and run off,