Well finally did this. My OCD wouldn't allow me to have just one switch and two blank panels, so I ordered three switches. Also my OCD needs to have the switches in the same direction, so the switch for the yaw sensor is backwards, as normally most accessories would not be on all the time:
I always de-insulate the terminals so I can solder after crimping. Just a habit from my Jeep I guess, so I re-insulate them with heat-shrink afterwards:
At least there is lots of areas underneath to keep the wires out of the way:
I think with three switches it looks OEM: