You might want to try a light "polishing" wax - which will remove some swirls and light scratches. Then apply a nice, normal finishing wax when you're done. I've used Mother's and Meguiar's waxes with great results. Tiny hairline scratches and swirls disappear and the paint looks incredible.

Don't get too ambitious and get a "compounding" type wax, which is grittier and has more "bite." This stuff is great for older cars with oxidized paint and certainly removes the heavier scratches - but I'd use it as a last resort and certainly not too often.