But sometimes I tap a little too long on a switch and get the hold function by mistake.
I had to disable the hold function on my tap tempo switch for the same reason.
So for example, my approach is not wildly different from yours. I live in a single preset, switching between 4 amp channels as a means of accessing multiple levels of gain.
PER PRESET SWITCHING AS FOLLOWS...
1: Select & Toggle AMP channel 1 & 2 (Clean & Edge of Breakup) [LONG PRESS DISABLED]
2: Select & Toggle between AMP channel 3 & (Crunch & Lead) [LONG PRESS DISABLED]
this is 4 levels of gain on 2 switches, but I have experimented with a LONG press option to allow 3 amp channels on one switch
3: DRIVE 1 Bypass [LONG PRESS to change drive channel]
4: COMP 1 bypass [LONG PRESS DISABLED]
5: PHASER bypass [LONG PRESS to bypass TREM]
6: TAP TEMPO [LONG PRESS DISABLED]
7: CHORUS bypass [LONG PRESS to activate tuner]
8: DELAY 1: Bypass [LONG PRESS to change delay channels 1 thru 4]
9: VERB 1: bypass [LONG PRESS to change reverb channels 1 thru 4]
And behind the scenes, I have REVERB 2 setup as "always on" set to a small room ambience to make the in-ear mix a little more tolerable. With a tweak to allow a remote switch to enable an EHX Freeze type of reverb hold effect.
I seem to make some kind of change to the layout every couple days, but thanks to the LEDs and labelling, I've managed to NOT screw up any patch changes on stage (yet).
I know in the 'per preset' layout you can customize the label. I assume the same is possible for other layouts, but I mostly stay in per preset mode. So for my switches that are changing channel, I tell it to display the short block name plus channel (for example DRV1).