Whipped up a layout for a Creepy Fingers Hybrid Si/Ge fuzz with a Fuzz control:
..and one based on JohnK's layout with the Tone control:
Built both, confirmed as working for me. Tried 2N1304, MP38, 103NU71, 2N2222A, and some other NPNs I had lying around (Ge and Si) in Q2. It seemed to like the lower-gain Germs best - big, fat, and chewy.