Ok... so I got the parts and proceeded to tear it down. The two connectors are under the airbox, so.... Found that while the connectors are the same, the wiring between them is different. Finally found the different wiring diagrams for the two different bikes. I'm guessing the front indicators do *not* light up with the headlight on the Pan European version, as two of the extra pins on the four pin connector on the US bike have additional wires going to the front indicators that the UK version does not. Additionally, the remaining two pins and some of the ones on the nine pin connector differ as well. The passing circuit is tied to the 10A fuse that goes to the brake light and indicators, and completes the high beam circuit, in addition to the low beam which stays on, this adds another line to through the nine pin. Interesting, as the UK bike seems to have standard 55/60w bulbs compared to the USDM 45/45w bulbs.
So it looks like the easiest fix is to split the two housings and graft the UK top onto the base of the US model, and just adding the switch into the circuit on the dimmer switch (if I don't just leave it the way it is), as I converted to LED bulbs, and the extra current is still well below that of the original bulbs.