I'm also on the fence about upgrading. I am thinking of just buying a mac keyboard so I have an escape key. That key is very essential to my workflow. Do you think it's a good idea?
Back in the "old" days, nobody would have voluntarily admitted they used the regular Escape key implying their hand movement is anything less than optimal. Hell, Mac OS was praised for almost not making any use of the carpal tunnel inducing function keys.
Then the touch bar was released ;-)
For more complex modifications there is Karabiner-Elements, which is especially useful if you use Hammerspoon.
Sigh I'm just sad apple wont budge on a high end non-touchbar model
[1] https://pqrs.org/osx/karabiner/complex_modifications/#modifi...