Makes perfect sense to me.
Do you feel like there is still a rule missing?
As far as the visit, you've established that rule #1 is you will not take him to the liquor store after picking him up at the airport.
Since you have been gone from home for a few years now, I would imagine you're at a bit of a loss as to what it might be like once he starts drinking in your home, yes?