I'm in dire need for an upgrade, too, and have been broken up about the fact that there is no dGPU-free option this time around. As well as the battery life issues, which probably are at least tangentially related to the dGPU.

If there was any clarity as to when we could expect a new MBP, I'd very strongly consider waiting. But otherwise, I'm thinking I'll just bite the bullet on the current one, mainly because of the keyboard (entirely subjective, but I very much like it), and the screen (just as subjective). Anecdotally, I've seen a reasonable number of people say that the new MBPs run cooler and quieter, which, to me, is very appealing in a laptop.

As far as TouchBar goes: while playing with it at the store, I found some reasonably cute uses that might offset the loss of function keys, such as the seek-bar for Picture-in-Picture or AirPlay videos. And, of course, TouchID.

I guess what I'm trying to say is: if at all feasible – definitely wait for a refresh. But, personally, after taking the time to think about it, I've found sufficient reasons to upgrade even to the 2016 model.