After thinking about it (with the heater on in the garage this time) I realised adding shims increases the end float. I need to reduce it and therefore it’s thrust bearing or surface wear.
Many thanks for the replies. I’ll carry on cleaning and painting!
Jon