You poor thing Emz - going to work after having broken sleep all night is no fun . 

My last post on this thread lists a few ideas about rebuilding trust etc (if he has developed a bit of a cot phobia) - don't know if they'd be of use or not?

When Jimmy kept waking repeatedly and screaming as if he was terrified (at 7 months old I think) I spent about a week sleeping in his room at night. I got up to him ASAP, in the dark, found his dummy for him, tucked him in again and stroked his back until he was calm again. Then would tell him "I'm right here" as I was getting back into bed, and if he started crying again just say "it's OK, here I am", then tried to breathe loudly and slowly as if I was sleeping and he'd usually resettle quite quickly. A week later I moved back to our room, but jumped up and went to him as soon as he squawked. Would resettle him and stay with him for several minutes at first, then less time each time, until I could leave him and he'd stay calm. Two weeks after I moved back to our room he was back to normal, sleeping through most of the time, resettling himself and not randomly crying/yelling himself awake anymore.  Now he just yells out for help when he's wedged himself at the top of his cot and can't figure out how to get comfy again (about twice a week).

As you can see, I'm a bit of a softie  and felt like I had to show Jimmy he could trust me - that I would come when he cried out and was scared. But it was the toughest 3 weeks at work I've had so far - felt like a zombie the entire time .