steve,
AutoMagic makes a great product called XP polish. it is used to remove light stratches, Auto Magic XP Polish - SharpTruck.com - Truck Accessories.
As for a wax i would recommend another AutoMagic product, it's called Awesome Gloss (Auto Magic Awesome Gloss - SharpTruck.com - Truck...