Have you thought about whether your water needs a water softener, or do you just want cleaning to be easier? If you want a permanent solution, you won't get around a water softener - that's the only thing that really works because the stains won't form in the first place. Until then, I'd try citric acid instead of vinegar - it's stronger and doesn't damage glass.
The important thing that often gets overlooked: no matter what product you use, you have to dry the glass immediately after cleaning, otherwise the limescale from the cleaning residue will build up again. It's really frustrating, but that's just how it is.