Sorry Mr P to point out some issues with the wiring but just trying to be constructive so please don't take this the wrong way.
Far too much bare conductors on show, so the insulation should be closer to the connection.
Crimps a decent crimper, and knowledge on how to use them might be a good investment as it will give a lot more security to the connections if done correctly.
A Wago lever connector will be much neater on that neutral link, would also do away with any exposed copper work.
There is whiskers on your connections, you need to strip and twist and connect the copper work a bit more carefully.
Not sure how the switch is mounted so can't comment there. A bit of shrouding over the connections would be advisable.
Where the cable comes through the gland it should have the outer flex pvc on show looks like it has been stripped back too far.
Writing this while doing other things so I am a bit distracted, so apologies if I have missed things, I do like the fact you are bringing life back to old kit, and well done on coming on here to seek advice.