This may sound funny, but try rubbing with Mayonnaise, let set, then wipe clean. If this doesn’t work, there is always sanding and refinishing.
The experts at eHow suggest the following solution:
Apply a small amount of non-gel toothpaste to a damp, clean, lint-free cloth.
Rub toothpaste over the water spot.
Remove film with a clean, damp cloth.
Dry with a clean, dry cloth.
Polish.
The situation it sounds like the finish has gotten underneath if you are talking about white water has fissured and water marks blushes and the only cure.