I've had similar issues. It sounds like you are on the right track with trying not to engage in compulsions and trying to distract yourself. I've always found watching a drama on Netflix or something to help me when I really get stuck because I find that it's pretty hard to think of something else when you are absorbed into one of those haha.