Ok so a quick update...
Found the wires for the trip computer but not for the control switch so a bit of wiring to be done


Wired it in in the heat of the day yesterday...
and cut the hole for the control switch:



Result! An installed switch and a soaked shirt...
Will update once it is all back together