one of my problems was interfering too much, eg if she did wiggleand half sit up etc I would lay her back down, ive stopped now as I worked out she was getting comfy, like a dog walking in circles she does the same.
in saying that we have only gone from 1-2hr wake ups to 2-3 msybe 4 hour wake ups over night....