Thanks Ben,

Good point on the traces lifting! I can just leave the plungers there as they will not be accessible. I'm going to take pics along the way with a write up and send it over to you when done in case it is of any use.

Unfortunately the base of the switch is plastic with those 2 little plugs going into the board. That plastic melts and makes a mess (like glue gun poop) so I wound up having to completely remove the switches down to the solder pads. That gave me more room to use as I put 30 gauge leads on them. Since the switches are surface mount they don't really tear up the solder pads or traces fortunately when removed.

Next time you are getting panels, could you have 2 boards on a panel not have the switches populated for me? That would save me the desoldering.