Fuzz Face bypass switching

[triskadecaepyon]

Ok, I've decided to change my NPN fuzz face to its intended PNP, respectively.   I's using a 3pdt switch, and I want not only true bypass, but power switching too.  Is this wiring correct?

Effect in | Effect Out | V+ circuit

Jack in   | Jack out   |  Batter snap red

Jumper   |  jumper   |  nothing

3 questions:

If my NPN FF is working well, should I change it?

HOw do you wire the protection diode for accidental shortage from the battery?

Should I use the designated resistor values that Small bear sent me?

Thanks in advance.

[triskadecaepyon]

someone please verify I need to use it in a gig tommarow

[Outlaws]

someone please verify I need to use it in a gig tommarow

If it works right now then don't screw with it until after the gig.  ...just my advise.