I’ve managed to completely reprogram my muscle memory in a day somehow - whenever I want to close a tab, I now do Ctrl+Shift+W, which also happens to be the shortcut for closing everything in a lot of apps.