Are you using the old GTR/Canam wiring loom or the new EVO loom? If the former, how did you connect the lights/ballasts to the connections on the old loom?
I have the GTR loom as I didn't want to wait 12 weeks for the Evo one. The factory said it's just a case of changing the connectors in order to install the new lights with the GTR loom.
There are also new elements such as heated screen/reversing sensors which I guess will have provision in the new loom, but I take your point I did consider your option, but thought it a little more complex than changing the end connectors for the lights alone.