oh you poor thing, we had a very similar sort of problem. He hated being wrapped or having mittens on htne i had a brainwave when he was about 2 months old. I bought a nice safe Tigger toy and every time he would be put to bed i would (he slept on his side) put tigger in between his hands and he would grab hold of Tigger and go straight to sleep, problem solved he just wanted to hold onto something and squeeze it, he still does it now.

GL i hope you find something that works for your beautiful little boy.