Right, the nightmare is finally over!! In this pic you can see an indent where the woodruff had been jammed against the cog and how far apart the keyways were!
Also to give you an idea of the previous owners hamfistedness, at the bottom of the pic you can see a cover for the wiring, those...