Comment by chasil

Your other option prior to your first visit was to load LineageOS, but that would also have resulted in a wipe.

It would have given you time, however, to find a technician with more experience with this model.

On the other hand, the battery problem was physically dangerous, and that should have some bearing.