Yeah, I wish there was some advancements made when it came to trying to create swappable battery devices that retain water proofing. That area has just stalled since expensive disposable tech is more lucrative. Average person should just get a new one like you said as long as the process is still more difficult than changing a light bulb.