Do you have a thin baby sleeping bag? I swaddle and then put DS in the sleeping bag - it stops them from unwrapping himself and startling himself awake. Saying that, he is doing a similar thing at the moment as your DD, unless I put him down that way or cuddle him.