A clay bar or good cleaner wax should be sufficient to get water spots out.
Hard water etching on the other hand, needs to be buffed out. If you take care of the water spots when or right after they happen, they wont advance to this. But if the spots sit, and the water evaporates and the minerals rest on the paint, they etch into the clear coat.