Thinking of upgrading to a 7, probably Pro when Black Friday deals hit. My 6Pro battery life sucks shit, I've replaced the battery with an OEM one and not much better. I use my phone throughout the day, but most of it is streaming with the screen off. Always needs to be charged. Normal amounts of random app use and browsing.
I get all day usage, mostly playing podcasts to Bluetooth headphones for multiple hours, with a bit of light gaming (mostly a few idle clicker games). I might get a second day without charging but that'd be pushing my luck.