Thanks all
It's been hard-ish work, but worth it. I was planning on doing some more this evening but the weather turned sour.
Rog, I borrowed a simple (quite old I think) machine polisher from a friend. It's pretty big and cumbersome, but it's doing the job OK.
With the machine, I've used Sonus SFX-1 Restore Polish on scuffs and heavy scratches and then Sonus SFX-2 Enhance Polish to remove swirls and give a polished finish. Then, by hand, I applied Klass All-In-One (not sure if this step was necessary, but I had it so used it) and buffed to a shine. I then applied the wax and buffed by hand. I feel you regarding dust - I also had to give it a quick detail spray with a microfibre towel the day after I started. Real handy stuff, but yeah, not good for heavy coats of dust/muck.
Of course, I used a clay bar on tar marks etc - not too many thankfully.
I'm quite happy with it, but I could do with treating myself to a better machine and some decent pads to REALLY get rid of ALL swirls etc. However, I'm still pleased with the results.
Fullpint. For the lights and cups, I just applied the SFX-1 and then SFX-2, by hand, with the supplied applicator and buffed off. Oh, I also waxed them. I was really surprised with the results as they were very dull before hand. I wish I'd taken before and after pictures now.
Thanks again and I'll update as soon as...
And your lights look MINT mate. 
