What has helped me the most so far believe it or not is quitting smoking. Not so much because smoking was a trigger, but because it's shown me that I am capable of going toe to toe with myself. Exercise also seems to be helping me. Although, I will admit I have begun to drink quite often, every night in fact, and I am working on that.
I will give some of your suggestions a try.