Ok, using the PC I have now fully removed all the swirls. So far I have used Megs Swirl Remover 2.0, then Swirl Free Polish. Then at a later date I used Megs Speed Glaze.
As I said, all the swirls are now gone, however the car still has random, fine scratches. So I am looking for something...