Thanx girls, I might try to 'not' feed him tonight and get him just to settle back to sleep.
I think his main problem is that he wants to suck his fingers or thumb(he hasnt decided which one yet) and he still wants to be wrapped. I've tried wrapping him with his hands up near his face so he could still get to them, but he just ends up untucking himself and then gets *****ty coz hes not wrapped.
If he could suck his fingers then maybe he wouldnt need me at night, maybe??? Anyway I'll try not feeding him tonight and let you know how we go.