I just spoke to my guitar / amp tech. Great guys, trust them with my valuables!
I'm going to have them replace the switch, output jack, and pots all at once, rather than piecemeal through the updates. It'll cost around $120, but he said with my other updates I'll have a great guitar, "darn near...