ok babe, stop wrapping him. We stopped wrapping Mason at about 4 weeks as well. I buy the cheap sleeping bags and have had no problems. He sleeps MUCH better, and much longer because he doesnt feel restricted or trapped, and can move his arms and legs if he wants too.

Right now he is sleeping with his arms next to his head flexing his muscles

Without being wrapped, good idea to put him in a bonds suit with the mittens, or put some socks on his hands as they get a bit cold. Put his feet almost at the base of the basinette and put the blankets stretched across and tucked in the sides. He wont get stuck then