I had to break this habit as well, and also as a result of the touchbar. I empathize with this struggle, it took me a couple of weeks to get used to capslock escape, but it was worth it.