I think you should definatly take it one day at a time. You have great things on your agenda about GAL, keeping the house clean and I think it is good that the times seemed to work out on their own with his trip then your trip so it's not forced 'ok go to your friends now', it's more natural.
P.S. Very good idea for tonight..you should be in bed naked but sleeping...lol.
