Update on the Kalamazoo, I replaced all four pots, caps, wires and switch. I only kept the jack and the pick-ups.
While I had her apart I added RF shielding as described by John S. Atchley @ http://www.guitarnuts.com/wiring/index.php. Works great, really cut the hum down a lot, not totally but a significant amount. I also added the big cap for shock protection, I've been zapped while testing a 100w amp I was fixing, felt like the strings were cutting into my right palm.
Then the switch died and I just wired both pick-ups selected all the time for now.
