You know you can save custom toolbar layouts with custom workspaces? That definitely survives major updates. It also lets you have alternative sets of shortcuts so you can trigger your actions, but still use the default shortcut by selecting the Essentials workspace which is hard wired.
For me the issue is really a non issue. With the ability to customize the tool bar I like to have the choice of using shortcut or mouse, according to what works best a particular moment in time. So I break out most of the tools into separate groups, or by themselves. I also remove the shortcuts from seldom used tools. This means I have to use a double row, but that's OK.
I also turn off Use shift key to toggle between tools. I can think of no reason why I would want to use two hands instead of simply tapping the shortcut. So if I have the Move tool selected and hit the J key, I know I'll get the Spot Healing brush because it is to the left of the Patch tool. Hitting the J key again takes me to the Patch tool, and keeps on toggling because I have removed the shortcut for the Healing brush and CA Move tools. That goes with my default workspace, and like I said, when CC2017 was installed, it kept on working for me.
