I mostly agree although I don't really know if my iPhone 6 seemingly getting slower is due to power throttling or general software optimized for more performance over time. The geekbench numbers are still fine. I'd hesitate to get a new battery purely on speculation my phone would get faster. So it would be nice if there were some indication of where the battery is in its life. Though like you, I'm upgrading to an X in any case.