just for the sake of it used your pdf to build the s1 caps version, looks good too and no need to move the labels around but...
The hard way seems to be way harder than I thought (custom panel, pcb/panel gap, third hole on the switches, led wiring, etc...