Exactly this. People don't realize that almost nobody needs better CPUs in the phones and almost everybody would benefit from higher capacity battery. If batteries were developing at the same pace as CPUs we would have batteries that last for years with a single charge. For me the ideal phone is iPhone 6s that does everything that I have ever wanted to do with a phone, and even more that I do not actually need. The only missing feature is a long lasting battery.