I think my new plan is that I am going to call around 10, and get an idea about whether he actually still wants to hang out. If he is irritable and sounds disinterested or like he is doing me a favor, I may in fact decline to spend time with him and go over on Sunday instead.
Hey ITH
I like this plan. Just stop by at the time you think will be appropriate and be prepared to leave again - in fact it may be 180 for you to do so. Show him you are not hanging on his every demand. If he can't be respectful to you (i.e. if he seems disinterested as you said) just say leave him to his funk and show him that you have plans and GALing and you are not reliant on him.
This is what I would do. Perhaps don't go over too early if you think he will be hungover, I know I wouldn't appreciate that myself