I just polished my windshield with Zaino Glass Polish. I guess I don't have to go to the gym today, maybe the physical therapist!
All kidding aside, with a little bit of elbow grease and the Z, I was able to polish out almost all of the water spots. It did very little for the wiper marks, but...