Yeah, what I've been reading wet sanding is my only option for dealing with etched in water spots. Thankfully it's very hard to notice these spots unless you plant your nose to the surface.