I’ve been messing with this amp more and ended up changing the topology again. Right now I have it so there is a 2 gain stage black face channel with the tone stack in between. In addition to that there is a switch that can add two cascaded gain stages with a gain control and tone knob before the black face channel to add a bunch of gain. The switch also adds the master volume and alters the tone stack.
I think I’ll be sticking to this topology since it makes for a nice clean channel and a relatively high gain channel. I’m still tweaking component values but I think I’m close to calling this one done.