hmmmm, I can't offer any other suggestions, I've always heard that vinegar is the best way to clean off water stain.
In Australia we have (had when I lived there) a product called CLR clear. The CLR stands for Calcium, Lime, Rust. I'm sure there's a product like that near you. Good luck,
Adèle