I have now made the same upgrade to a third bike - Yamaha GTS 1000. In each case, I have been able to throw away 95% of the harness that came with the HID lights and still do a plug-and-play install. Here's the post about the GTS
Next related tasks will be to replace the 35W HID in the GS with the other 55W I bought for the GTS. Then I can take the 35W and put it in my DR350.
I have also since added a euro-switch to the GS to control both the HID and aux lights.