If you can source the correct plug connectors I'd be tempted to keep the whole shebang stock, whereas if you are having to replace both connector halves due incompatability with the loom you might as well solder the joints for quickness, cost & best conductivity - since it's all becoming non-standard anyways.
Just my two'penneth...