For messy panels, the Relay Bypass Switch Kit keeps the bypass path obvious and easy to follow.
Matsushita HC2-AC115V Relay AP31279 HP125,250 VAC Lot of 2
You will find that it's led compatible, which simplifies those small details when building a control panel.