You used a solvent to clean both surfaces before applying the tape, yes? You can always try a very thin layer of Gorilla glue, instead of the tape after removal of the failing two-sided tape.
Battery replacement took 3/4 of an hour. Most of this time was waiting patiently for the adhesive to soften on the glass and plastic screw covers. I used my Aoyue 2738 rework station hot air gun at 130 C, this gave me a surface temp of 180 F by my Fluke 52 temp probe. Not having the iFixIt Technician’s razor kit, I resorted to a #11 surgical blade that I normally use for mold making; which worked well enough, apart from my inept handling on the plastic screw cover. BUY the Technicians razor kit.
Also, there is a pry point for the battery directly beneath the buttons that the spudger fits into perfectly I used this to create a gap to allow the hot air to soften the adhesive holding the battery in place. I found that the Jimmy tool worked very well as a lever to hold the battery away from the case; which allowed the hot air to separate the old battery from the adhesive. This obviated inserting any tool deeply enough to damage the cable running beneath the battery.