try a good polish,eagle 1, meaguires, etc... The 3 step system from meguires is really good, 1st. step is paint cleaner, 2nd is polish, and 3rd is wax, your car will shine very well and won't have swirls, at least mine doesn't
i dont no about the swirls but i do no the water spots. say it with me " Mr. Clean " hell that car wash hose adapt is well werth the $20 i spent. i do no that you should when washing the car to prevent the swirls use at least three cloths, 2 for the body that you should rinse constantly and one just for the wheels and never use the one that you used for the wheels on the body.