Firstly thanks for the great advice guys.
So an update... Ended up going the Meguirs way on the car
Did the clay, then some ScratchX and the 3 step process. Most ofthe swirls came out and the car looked great took me ages but well worth it.
Was going to take some pics, but was to buggered to do so.
Car got a bit a few hand prnts etc over the next few days so tried using Quik Detailer, but I think I made a mess of it, as just ended up re-doing that section.
Anyway now I'm looking at the best option to use in regards to car wash. I have been using Meguirs Gold Class, but I've noticed it can leave some water spots.
Is there any Meguires car wash product that I should be using? I want to maintain the wax I put on and not have any water spots. I'm thinking the NextGen stuff.