Just this past weekend I stopped by autogeek.net headquarters and asked what to use on brand new cars that have minor swirl marks.
I didn't want to polish THEN wax so he recommended the one step griots plish/wax-sealant.
I'm really glad I went with their recommendation. I did the entire car in one step. First washed with dawn then clayed the entire car then used the one step with their orbital.
Here are the pics;