OK, my silly fault - after resoldering everything 3 times and it working sometimes and not others, i eventually clamped the EOS switch together and it was fine.  So the problem was the new EOS switch was just a little out of adjustment (there was a small gap between the 1st contacts).... a lesson for next time!