I just switched to a new Touchbar machine, and am adapting to the fact that I had several of my most common shortcuts bound to F-keys. At this point, I'm seriously considering trying to add better touchbar support to Emacs to work around this.

You should. Better Touch Tool is great, it was a must-have even before the Touch Bar came along.