[rexcramer]

I have used Mothers Water Spot Remover and been very pleased with the outcome. A brand new single edge razor to shave the high spots followed with polishing compound should do the trick.