Try Limeslice's idea hun
Thats what I did too.... you'll find he'll start sleeping better during the day now that he's started rolling/moving.
Carmelo is still crapola if we're in the pram and we're out (lucky if we get a 20min cat nap) but if we're at home he'll sleep 1-2hrs in the morning and then again in the afternoon... and he's back in the bassinett now where as before I was doing what you are and laying down with him on the bed.