Have you tried CLR ? Just used it on a car to do the same and worked fine took stains/spots off easily. After done I used fountainofyouth.com quick shine as a wax/sealent and you would never know the spots were there.
had to do windshield hood and front grill due to customers sprinkler system
