Well no joy...
I waited on my shiney new replacement switch. Freed the original one and two rusty bolts and replaced with the new one. It works less than it did before.
Guess it is back to the drawing board.