Almost done. A couple of lessons learned, it would be easier to abandon the PCB as George advised, but if like me you insist on keeping it, then un solder it from the motor as part of the disassembly. I didn't - it made the work much more awkward, and detached itself anyway!
Early testing was a success, the only glitch is that forward and reverse are excusing the word, reversed! I need to fix that and test again.