Thanks to all your advice the decision as to which metal polish should replace my empty tube of autosol was easy.
Got the Megs metal polish today.
Just finished polishing passenger side headlight. Took a while by hand but no swirls and came up a treat.
Passenger side catches the afternoon sun and was twice as bad as driver side, but now looks 100x better than driver side.
In 10 years time when I finish the tub of Megs I'll know where to look for advice on a replacement