A good day in the workshop today continuing with wiring of instrument panel switches, and I think I'm about done. The wiring loom turned out okay, and I installed it in such a manner that I can still remove the whole panel and leave the loom behind.
As well as wiring to all the switches, I also wired up the dimmer for the switch backlights, and the combination push button/indicator lamp for the CO monitor.