I totally agree with using 'challenge' rather than problem. It's one of my strategies. Also about focusing on the richness of a life not dictated by alcohol rather than getting into the mindset of being deprived.
I think you are off to a good start. I don't know what to tell you about abstinence vs. moderation. For many people moderation truly isn't possible for them, but you will only know if you try.