I went back to this and tried to hunt down the switch pop, trying to tack extra Rs and Cs into the already nightmare-ish tangle of wiring proved... frustrating... so, I gutted the thing, tweaked the circuit/schematic a bit, laid out the whole thing on a single piece of stripboard, and rebuilt...