Hey how did the battery swap go?
I'm about to do the same thing. Got new phone and was getting ready to pass on my G6 and found the same thing, battery swollen and popped the back case.. So I'm probably going to go your route and replace the battery.