What are you using for sleepwear for your baby?
LO was terrible with her arms and scratching her face at night so we've been using Gerber kimono shirts with the fold over cuffs. I've also found that the long sleeve helps keep her arms in when she is swaddled.
Now we've moved from a swaddle with a receiving blanket and using a woombie zip up with the cuffed kimonos. Unfortunately LO (6 weeks) has grown completely out of the shirts. I have a couple of the sleepers with the footies but I don't think we can get away without some form of the swaddle and a long sleeve - footed sleeper due to the heat. I thought about putting her in the woombie zip up in just a diaper but I know she will get her hands out. I did see some use onesies, but do you find the snaps to be annoying for nighttime diaper changes?