Zaino will fix that. It also helps if you don't wash the car in direct sunlight. Especially not drying in direct sunlight. My friend who details cars has a tent he puts up to keep light directly off of the car.

After using Zaino claybar, polishes, you can use the zaino soap/z6 after spray to remove any water marks/swirls. Plus it provides an additional protective coating between each wash. I use zaino on my crossfire and bike. Super wet finish, no water spots, etc.

If it still doesn't come out, you'll probably need a buff or compound job on the clearcoat. Any good detail shop/person can do this. Don't take it just anywhere though.