Swirls in my black truck and oxidization in my rims?

I have a 2002 Black Toyota Highlander and I made the HUGE mistake of compounding and waxing it one day. Now I have swirl marks everywhere! I've heard of using a "clay" product and there are polishes and waxes that say they remove swirl marks - which is best? Also, I have lovely rims that are... show more I have a 2002 Black Toyota Highlander and I made the HUGE mistake of compounding and waxing it one day. Now I have swirl marks everywhere!

I've heard of using a "clay" product and there are polishes and waxes that say they remove swirl marks - which is best?

Also, I have lovely rims that are original to the truck that now have some oxidization on them, is there any way to get rid of that?
3 answers 3