If vinegar at 100% doesn't work it's hard to believe it is water spots. Try a little acetone on a few spots. water deposits do not etch as far as I know. 100% white vinegar but like I said try the acetone on a small area and wax after.
BAREFOOTING: I knew it was gonna hurt when I felt my arse cheeks hit me in the back of my head!
!UOY NAHT RETSAF MA I TUB KNURD EB YAM I