Mine's dead silent running Affinity and I get around 10 hours battery life. Did you make the assumption the battery is bad from day one? Because they run a little power hungry for a day or so while they do encryption, work through Photos and set everything up.
The 2016 is the better computer, with a more powerful CPU. Just ignore benchmarks as you're looking at max performance potential, not sustained potential. A higher wattage CPU is faster day to day. Battery wise I think the nTB models get a little longer battery, but on average you're looking at maybe an hour. If an hour extra battery is crucial to you (You can plug either of them into an external battery bank) then that's the one. However if you plan on having the computer for some years, you might prefer a more powerful machine than a minuscule increase in battery life over the course of the lifetime of the machine.