As far as getting rid of the ball swirl Blair the Magic Erasers are about the best thing to use . I got rid of a fair bit of bad ball swirl on my Lucky 7 by cleaning it first with Shellite , then quite a few hours spent with a magic eraser and Novus 3 ( DON'T RUB TOO HARD AND / OR IN THE ONE SPOT WITH THE MAGIC ERASER OR YOU CAN DAMAGE THE ARTWORK !! ) . Once you've got rid of the ball swirl to a level that you are happy with give it a going over with Novus 2 and a soft , clean rag followed by Novus 1 . Once you have done that a bit of elbow grease with some Caranuba Wax will bring it up sweet . ( P.S - The results on my Lucky 7 can be seen in my avatar ..  )

Cheers.