What I would do is get some Meguires Cleaner Wax and a buffer. The cleaner wax does a great job in my opinion. Now after you use the cleaner wax and buffer to get rid of the swirl marks you can use a finishing wax by hand and that should do the trick. The only products that I use is Meguires and 3M. Also the cleaner wax will removed light scratches and scuff marks as well as water spots too. Hope this helps.