If you need a phone now then get the S7E!! But If battery is your biggest issue and you can wait, I'd just go for the Note 6. I mean, the battery is usually better in the note series right?
The Edge Display is nice. But I think most people get it cause it's feels more premium. I kinda feel like it was like the S4 when they introduced the waving features.. no one REALLY used that... Though I can see more people using the edge features.