My attempt at it was to purchase new YAW connectors to avoid cutting. Worked great however after finding the 2016+ issue with brake override decided to stop making them.
The connectors are not that expensive and it exercises the need to make a harness which is always a great excuse for me.
Great job on the switches.
Here's mine.