The layout above is now verified both stock PNP version and a NPN version. Nasty velcro fuzz galore with an interesting tone control. I couldn't resist to do some tweaks, I increased the Buzz pot to 200kB to squeeze out more gain. I also ditched the switch and soldered a jumper betwwen ground and the emitter of Q2. I also put low gain silicon transistors for Q1, it feels more stable that way.