Your post has me stressed out imagining what it would be like to live with someone who wanted to spend all their free time doing stuff with me, but who also drank too much (I am also an introvert who has dated substance abusers). I think this is less a trigger thing and more a 'who *would* enjoy that prospect' thing.

Was this past week an aberration? He didn't do that over the summer? Have you talked with him about how you will spend your time when he retires?