Well done! that looks lovely. A very similar colour with the clear as my PBG1.
What are the odds of cutting the wire with that screw? Nice catch, how long did that take to find???
I haven't had a problem with the selector switches myself. It really is worth swapping out the capacitors, next time you do an order just ask for a couple of the orange ones. The tone controls really work well then and they are inexpensive. Your soldering looks great from here, and if it works.......