I work primarily on web apps and I use
Both these machines are damn good and keyboards on them work pretty well.
My next choice of machine would be the new Dell XPS 13. Still thinking if I would get rid of windows entirely or dual boot with Ubuntu as I am not dependent on any software which runs only on Windows.
I am sitting out this generation of MacBook Pros because of the keyboard and the Touchbar. While keyboard might be improved, I don't think they'll get rid of the touch bar or provide models with the same specs as the touch bar variants (non-touch bar variants are lower-specced). I love the physical esc button too much.