Yeah - I used loom tape in the end:
Instead of heatshrink, I used self amalgamating tape to finish of the ends and to reinforce where the loom splits.
As for the other connectors - I ended up nipping them off and terminating the wires in the loom for the three way OBC plug, and the brown - to blue connector was removed and the wires joined with crimp connector. I tried covering the plugs with the loom tape, but it didn't lie very well over them...