WF-1000 Series Question

I have owned XM4’s for the past few years and have been really, really happy with them until the battery issue. I inexplicably escaped it until only a few months ago, despite updating when updates come out. Now I’m lucky if I get an hour of playback time, so it’s time to buy new headphones.
I live in London and like the ease of use of small ANC earbuds, especially on the horribly loud Northern line.

In your opinion, reader, what is my best option?
Do I buy old XM4s again, buy current XM5s, or wait until the XM6 release?
If I were to buy XM4s again, will I run into the same battery issue?

Or, do I look at competitor offerings? Apple, Bose, Shure, Cambridge, etc.?
I want to trust that when spending this much money, the product will last a long time. I also care about sound quality (as best as one can get from Bluetooth earbuds).
I listen entirely from my iPhone or iPod touch.
Thanks in advance; I’m feeling overwhelmed with options at the moment.