I am not saying you have to give-up if you see something worth holding onto but I think time and space is the only way here. I would encourage him to get his own place.
So my question to you is that if you knew 100% he wasn't coming back would you tolerate his behavior?