I've used Bon Ami cleanser with great results on tough water spots.
It has never scratched for me. Although I would suggest you try out on a piece of glass first. I don't use it all the time. Just every so often when I get those tough spots.