Yes. iPhone 6s is what I’m sticking with until they double the battery life (in real use, not watching a video) or do something else I might actually care about.
I would love to see hardware upgrades halt for five years while we all (collectively) get our software shit together and optimize everything for performance. That'll never happen, because I think it's in our human nature to Get Things Done in the short-term with compromises that affect the long-term.
Poor software performance is our digital world's global warming.