It’s way too late for that. You want to delay delivery another year? With LH Labs history of design and development working on geological time, redesigning the case and circuit board for this change could easily take more than a year. This is a decision that should have been made two years ago.
Simple solution, and usable for your Wave and your phone is to get a power bank that could be used to charge either/both of them. If necessary, a nice one with a solar panel could extend time away from the power grid.
I do agree that the battery really should have been made tool-free swappable in the field, rather than just user replaceable.
@J.P. I am not sure it is too late. They do not have a battery even set up to go. Larry said they are still looking for one. Development is still not done. I’m betting they aren’t even close. Pity really, but that is what I think.