With the limit switch problem I was having when cutting some aluminium I have ordered some some new optical limit switches.
I possibly should have gone with Hall effect type, not sure at this stage so I'll give the Optical ones a try when they turn up and see how they go.