OK people, swapped out my BoB and yay, limit switches and E-stop all working fine.
Will spend next week tweaking and I think I might have to do some work on the ball screw to the z as there appears to a lot of backlash.
Thanks to all for your help, I am sure I will have more dilemmas along the way so keep an eye out for my next crisis

Steve