If washing, with a quality car wash soap, and then drying does not solve the water spot problem the next step would be to use a wax. If you do not have a wax that is also a cleaner then I would purchase one and give it a try. If the cleaner wax does not remove the water spots then the only course left to you is to polish the car then wax. A good polish will remove the water marks. The problem is the water marks have imbedded themselves in to the clear coat and polishing is the only way to remove the water marks. Good luck and let us know what happens and what you did to remove the water marks.
Mods so far: Wood Dash Kit-Window Tint-CATZ Fog/Driving Lights Custom Fabricated Stainless Steel Mesh Grill-Painted Calipers-3rd Brake Light Decal-Strut Tower Brace.INTENSE™ Level 1 L36/L26 Performance Package. ZZP ER Rockers and a HV3. L76 springs