For those following along at home, the battery eventually returned to its defective state.
More as a challenge to myself, I acquired a (cheap) hot air rework station, flux, solder paste and kapton tape and a replacement switch. From what I can tell, this is a near exact replacement for the...