1. Created a harness to connect most of the center panel switches via single connector (I was going to include the landing light switch in this harness, but its 14 AWG wires would not work in the CPC connector. Routed the harness along the inside bottom of the panel, sheathed it, and attached it with two Adel clamps attached to the bottom flange of the panel.
2. Created a separate harness and connector for the landing light switch.

I've made sure that all the connectors for the panel are distinctly different, or have a different number of contacts, so there will never be a chance to plug in a harness wrong.