Talk to a few auto-detail shops. The best way to remove swirl marks and defects is a hard buffing using a power buffer. Not the kind you buy from a kit at auto-zone but a professional high-speed buffer. Someone who knows what they are doing can remove all swirl marks, over spray and defects even on new cars. Friend of mine just bought a 2015 Chevy 1500, had it buffed by a detailer he works at the dealership with two weeks after purchasing it, even on a new car you can see the difference and it looks great. Shouldnt break the bank either, $100-$150 should do it.