If a water stain can't be removed by a simple glass cleaner like Stoner's then I try Plexus, which is an excellent mild polish and protectant for all plastics and glass.
If that doesn't work then the stuff you mentioned is worth a shot, or one of its competitors.