Update,
Khaled acted really well at his swimming class! And he's been doing excellent with bedtime all alone in his room. Not to say there are days where he doesn't get TV because he didn't listen to stay in his bed, and it still takes him a while to sleep, but overall it's pretty quiet and I'm sure he's proud. He sings little songs to himself and I hear stories he makes up.
We had such an excellent visit this weekend with Danielle and T. Danielle came to the pool, we all colored on his cardboard house, picked up some leaves, did a little festive Bday decorations, and just plain hung out!