The meguiars product line is by far the best I have ever used, I even had a scratch that some jealous A-hole had keyed into my X but The wax/polish combo made it disappear. They also have a swirl mark remover that I havent used but it may be worth trying.
_________________________
04' SVT Focus, EAP, Pitch Black, ZX5