Oh Saluki, perhaps you should talk to your landlord about one bedroom apartments now. I know from personal experience that living with someone after its "over" is an absolute nightmare and will definitely not help you feel any better. Maybe you could find a roommate for him, so he doesn't have to leave (which I personally feel is amazingly kind of you if you choose this route) or find a roommate for yourself and tell him to leave.

Huge hugs to you. I know that he doesn't appreciate it, but I think its wonderful that you are so good at taking care of yourself. I remember when I used to be independent and I miss it desperately.