Awake time at night

sounds to me like he's still working out the whole day/night thing - babies have it backwards to start with.  He'll get there - sounds like you're doing all the right stuff already.  I'm guessing that you're probably already wrapping him for his sleeps?  Swaddling newborns nice and tight makes a difference (unless they seriously hate it).  Are you comfortable letting him cry for a while before he dozes off?  Maybe you could decide ahead of time how long you'd personally be comfortable with letting him go for before going in to try to settle him, and use the clock if he does have a cry (can seem like so much longer than it really is, eh!).  If he's not crying, it won't do him any harm to leave him to have a play in his bed - he'll eventually doze off, and it'll help teach him about nighttime being for sleeping.  Hope he gets it right soon - sounds very tiring. 

We do the controlled crying thing. Sometimes though he just works himself up into a complete state. Sometimes it does work though.

And yes he gets wrapped for every sleep. He wakes himself up by smacking himself on the head so he has to have his hands wrapped up!

I agree with the others, it sounds like he is still getting day and night sorted, it can take a while unforunately!

Hang in there, sounds like you are doing everything that you can do.