Ended up getting a 2017 touch-bar 15' pro and could not have been happier. At least with MacBook I do not have to think about the machine getting in my way while I am trying to do something productive.
The keyboard situation is bad but I am sure at one point they are going to have to do a recall or offer free repairs (Apple has done this before, look at the GPU issues).
The touchbar issue is overblown. Once I adjusted my workflows to use touchbar and customized the touchbar for the apps I frequently use I have definitely been a little more productive than my old macbook. People do not like adapting to changes.
USB C is not a problem anymore, since most of my devices are using USB C already I can usually get away with just couple of cables (usb c and lightning) while traveling.