Big thanks to both of you for letting me bounce these ideas around. Ugh, Katherine, as to resettling for naps -- We generally had to PU/PD - now I am using that acronym but basically what I mean is that end up comforting her on our shoulder and then putting back down when drowsy or when she has stopped crying. We do not follow Tracy's concept of holding for x number of minutes. Couldn't stand letting her cry for so long. But with the 3-2 happening and us needing 2 good naps as there usually isn't enough time for a CN, we have been sitting in the room. Sometimes she wakes up and self settles in the morning nap. Otherwise as soon as she whimpers or with the first wail, we put a hand on her and pat her shoulder lightly. With the afternoon nap, I tend to put a hand on her before time and she usually just stays asleep.
If you remember, around 4 months, she was resettling with just verbal reassurance and a hand briefly on her. I can't get why it doesn't work anymore. Even for night wakings, we end up having to pick up.