So, in a short summary what needed doing was ~ Usual strip&clean (obviously), new switch,bumper, new bearings (although they aren't brand spanking new..) and new bellows.
And that's all. I might add the link to the after video once it's done if I can be bothered.