That's great GF. I think if he was waffling he would have gotten out of staying there last night. You did great with his excuses. Rather than getting upset, you offered solutions...good job!
Would he be willing to slowly move back? He could just leave some clothes and a toothbrush to start. That way he wouldn't always have to go by his place. Does he have a lease? You may have to wait him out until the end of the month...if he pays rent for April...then it will be time to have a talk.
