Well I was thinking about leaving it until the 6 week holidays but really need her to start STTN again as I am so exhausted. DH will be having her for those 3 weeks that I am off so I will speak to him about what he thinks.
For naps, I don't always rock her, I cuddle her and lie down with her and she goes to sleep. Sometimes I need to rock her. At bedtime, it really depends, it can be a few minutes or 10-15. I always put her down and try to give her the chance but when she gets agitated (not crying which I know is wrong) then I pick her up and either pat her on my shoulder and sway or rock her again. If she is OT then I get her pretty much all the way to being asleep. Sometimes if she fusses, I just put her down and stroke her hair. I am not really very consistent as I just get so panicky and think you have to go to sleep!
I know in the next few weeks I have to put her down and leave her for naps. That is my target. So will hopefully do what I am doing at bedtime and leave.