Why stick with 16.04?
Over the first year after I bought the older X1, my battery life got an extra hour or so because of i915 module improvements. (I was following latest arch kernels)
There is a new such update for 16.04 at the end of this month. It is the 16.04.02 update.