I really don't had a lot of advise to give I'm sorry. I was only going to suggest a teddy bear or something of the sort to cuddle to sleep and who will stay with him through the night.

Also waking through the night, DD went through this (it only stopped about a week ago) and it was suggested to me that she may need to go to the toilet, but not really know it... I'm not sure if you're TT yet, but I just asked DD if she wanted to sit on the potty for a min, then I'd put her back to bed. Something to think about anyways.

One other thing DD is wanting now is her lamp on when she goes to sleep. It is a red lava lamp, so not very bright, once isn't on she doesn't have a prob drifting off.

I'm sorry I couldn't be of more help, each chid is different, but thats whats working for us. I hope you get it all sorted out really soon.
GL with bubby too