Nexus 6P or S7 Edge battery

[Hock3y Monk3y29]

I currently have the S6 Edge and I am a fan except for the battery and touchwiz, but battery is definitely my biggest concern. My S6 only lasts about 12 hours with 2 hours of screen on time, which is honestly pretty pathetic, and many people have always reported better battery. But anyways, I think honestly I would take whichever has better battery life. I'm talking everywhere from heavy gaming to text messaging, and I am looking for good standby life too. I lose like 6% every hour on my S6, so I want to make sure I get good battery life too. What do you recommend?