Check out Klinger Custom pedals if you haven't done so.
http://www.klingercustompedals.com/
This is my favourite Fuzz.