Use the water spot remover like the guy above said. It works great when detailing it off.
As far as the swirls....well...welcome to black paint. You could've gone one step worse and gotten the red(the softest paint). Claybars, wax, and some soft cloth's should do the trick. Just remember to keep that wax on, mang.