#2 is fairly mild. I use Meg's #80 or #83 with a PC, works well, easy off. For more serious swirls, rotary buffer or I'm in a rush, Malco Rejuvenator will out polish all those and leave a wax finish. I know the wax is not great but how many times do you spend hours polishing your car just right and run out of steam to finish the next step. With Rejuvenator I'm done after polishing, the paints protected and then rewax a week or two later with a better wax. Malco is mainly sold to pro's through distributors so it's a little harder to find than consumer oriented products like Poorboys or Meguiars but their stuff works.