Bear in mind that changing D2 & D5 from LEDs to Si diodes will reduce the volume. Should not be a big deal since there is plenty of gain in the last stage.
Check the collector voltages on Q4 and Q5. You want to be above 3V. If those transistors are too leaky, the sound will suffer. Legit 2N1308s should be fine.
On the topic of leakage, you will want to socket Q2 because you need the right amount of leakage in that transistor. Too little leakage and the gating is extreme.