Thomas, I'm glad you are angry, it means you are feeling something. It also demonstrates that you care.
I concur that the way you are feeling is probably very normal, but I think you have the right mindset. You must eliminate situations that will tempt you until you are comfortable in you own skin. I think many of us have been in situations like parties or vacations where you know you are not going to drink, but your basically grinding your teeth and biting your lip the whole time until you leave, then you breath a sigh of relief. After 6+ months, not drinking becomes the new normal, and its a lot easier. I wish you the best man.