I really appreciate everyone's thoughts and support.
Phoenix, you are right that he will not accept why it is different for me to drink than it is for him. Even though I drink socially it's not enjoyable to do so in front of him, so I doubt I will even feel like it.
Many have emphasized that it's important to enforce the boundaries once you've set them. For that reason I want to be sure I'm comfortable and can stick to whatever I decide. I don't think I can know exactly what that boundary should be until the situation presents itself so I think it's best if I wait and see how things play out. Maybe that's unfair to him and may even bring on more stress in the long run, but I guess I'm tired of trying to *****-foot around him. I will just worry about myself and if he's really upset we can always turn around and go back to the airport.