This has PROVEN to work. --> Spot-X. Can find at local Home Depot.
Hard water stains, acid rain, auto glass repair, spot-x, rust stains, cleaning product, water spots

I had same issue with my previous X5, tried everything and nothing worked. Finally tried Spot-X and voila!