I am going to try the vinegar route first and if that doesnt work, then try to find something similiar. I seen a commercial for "KABOOM" lastnight and thought it may work.. LOLThink you are stuck ordering online.
Vinegar often works. A lot of water etching has lime or other sorts of minerals that are broken up by vinegar.
Autoglym makes a glass restoration polish with pads for machine application.