it sounds as if you have issues with drinking, period. and that is perfectly FINE, however your bf DOES drink. and isn't showing any signs of willingness to NOT drink...for you.
that truly does leave you with a decision to make. if drinking is an issue, if it's part of your moral code, than you honor that and break off the relationship. HE is not required to live up to your standards, only his own. any relationship that causes grief, anxiety, and upset is toxic and unhealthy.