Trying to get Robby to sleep without a swaddle. He does pretty well but his comfort thing is rubbing his face and head. No matter how well I clip his nails and file. He digs deep enough to

Scratch and draw blood. Which clearly wakes him into a screaming misery. The shirts I have with sleeves mittens the Necks are insanely wide and baggy and I hear mittens are a no no for bedtime sleeping. Any tips mamas