i am totally hesitant regarding a new purchase, still using the mid 2009 macbook pro and could not really use the Wip 6 version due to not being able to install.
anyway from my understanding is that the newer laptops are really heavily throttling performance, meaning the bigger your cpu the more throttle you get, which makes choosing the better cpu almost obsolete. the only real upgrade would most certainly be the best graphics card you can get, here a topic touching vega slightly, i believe it should perform.
i actually want to avoid buying a new laptop and probably switch to a mac mini, but if a laptop is what you need for your environment than you have not much choice i would say. the new mac pro being announced now looks promising but its going to cost me almost a years’ remuneration which is really stupid, so a mac mini with weak graphics card would have to do till i figure out something else… if not leaving apple for good in the end anyway.