When apart I found the 2 toggles different. Tricky to swap at that end, cause the wiring there is different and has a wire going to the hi/lo switch.
Downstairs at the end that meets the main harness there are 9 wires on both assys, mine has 3 wires loose and a 6 pin block, the eBay one has 9 seperate wires factory terminals.
My question is will the 6 pin block be able to be soldered onto the eBay loom? The colours of the wires seem to be all the same. Pictures here.

eBay loom

The original loom of my bike.