I've come around on swapping batteries, and have decided that external battery packs are the way to go. Works on more devices, and you're not buying batteries that work on exactly one device.

Still want my phone battery to be replaceable, but I'm pretty fine with not being able to do it myself.