Thanks a lot for your replies, you have given me some great tips

We have had him in bed with us a few times. Mostly I have fed him to sleep lying down and still transferred him to his cot. I do love having him in bed with me, but DF isn't too comfortable with it. He is scared we will squash him.

I'll try some of your suggestions for his day sleeps first and see how we go