Scratching Face

hokiemama06

I want to wean DS from the swaddle, so it's easier to transition him from the cradle to the crib (which I hope to do VERY soon), but when he's sleepy or fighting sleep, he rubs his eyes with his hands, and always scratches himself.  I keep the nails short, and file them daily, but he always manages to take a chunk out.  Right now, he's got 3 scratches in his left eye area. 

I'm tempted to swaddle without arms, and put mittens on his hands at night to keep him from scratching himself if he wakes up before I do.  I'm hoping that will do the trick, but if it doesn't, does anyone have any other suggestions?