Try starting the day with early morning exercise. I've been doing that a while now for different reasons and found it also helps overcome the urges.
Day 25 - Year Three Hogwarts House: Hufflepuff I had a dream that I somehow relapsed. It made no sense. Then had another dream until I woke up. Relieved it was only a dream.