An interesting project Sparky, and well worth-while if you are keeping the mower for your own use.
I didn't really follow what was wrong with the drive clutch mechanism causing you to turn some of the clutch plate off to get clearance, so I can't say there was a better way, but I hope there was: that is pretty desperate stuff.
