Well if the etch is NOT a gold etch then I would use a non abrasive polish such as MASS or Blue Magic. If you find the "water spots" are actual light pitting, then try using some 0000 steel wool...