Given that there are no more good D2 motors so any future replacement will also be from a D3, why not graft the D3 connector on to the D2 wiring? Then the next one will be plug and play
I would get a D3 connector and terminals from TPS and splice them on to the D2 wires using heat-shrink crimps.