Clay bar won't help with swirls though.
Yeah, but it's always good to do before a polish.
Get some ScratchX if there is swirl marks, has worked very well on some cars i have used it on. Havnt used it on my own as i have had it from new and have always washed it properly.
Josh