I struggled to remove the solder, but was able to easier heat and afterwards remove with a solder sucker after adding some fresh solder (maybe the flux helped). I'm not sure if this is a real technique, but it worked for me.
I used the switches linked in the guide. They seem to work so far but time will tell if they last a reasonable amount of time.