Do you run Linux or Windows on it? I'd expect to be able to add quite a few hours to its battery life with the right Distro.
BIOS 1.1.9 gives ASPM and PC states up to 8. Linux 4.6 should give i915 PSR. Linux will do proper nvme power management once someone (me?) gets around to it.
Even Linux 4.4 is really quite good on this laptop.