UPDATE:
As I mentioned in the What Did You Do With Your Hellcat Today thread, I finally got the spots out.
Maguires iron remover, Chem Guys Water Spot Remover, clay bar.
I did not use the clay on the glass so there is still some spots visible. Next wash I'll clay the glass.
A lot of effort but it worked without buffing. Very happy!
