I have ordered the following items from Top of the Line Auto Detailing Supplies;
http://www.topoftheline.com/index.html
Porter Cable Polisher Package #EQ-PC7424P
Auto Detailing Clay #TOL-CA308 (8 oz. bar)
Cotton Baby Diapers: #TL-DIAPS12 (Pkg. of 12)
Klasse All-In-One: Klasse #Kl-AIO16
Swirl Remover Light Cut: #HT-61QT 32oz
Scratch Remover Medium #HT-300PT (16oz)
Cut
This should do the trick. Of course the last treatment will be plenty of coats of pure carnauba wax.
As always I will post the results.