Have you tried redirecting the habit? While changing at the core is ultimately the goal, redirecting actions into a set of more neutral ones might help. For ex

Have you tried redirecting the habit? While changing at the core is ultimately the goal, redirecting actions into a set of more neutral ones might help. For example, having a bracelet that you can play with, or even in some cases pull on to feel it snap back in place. It's very hard to redirect all the activity that our mind produces at all times, I have very similar issues and I understand that too.