Did you find that the GS6 felt better in the hand than the Edge? I am totally on board with your caution about battery life and you've aware of my thoughts. The smaller battery in the GS6 is achieving near comparable results powering a better device than it predecessor with a larger battery. If it gets you through a whole day at work, and there are options like charging at work and in the car as well as rapid charging, wireless charging and power banks, battery life while important should not be holding back your decision within the current paradigm. More and more businesses like Starbucks and companies like. IKEA are going to make wireless charging more common place. It's totally your call.
Yep, the GS6 was 100% better in the hand, much easy to juggle around if you were going to grab it to answer a call, and if you imagine how thin the edge is on the sides, and I really think people will be dropping them, and I refuse to put the edge in a case.
Will the S6 be better than the iPhone 6?
The current battery tests are so mixed