I never thanked you for long patient post when I was at end of my tether with dd's night-waking. She is better now (these patches always seem to precede a bunch of teeth - never just one - not that I ever remember that at the time!) but I decided to give your plan a go anyway, just to crack the habit.
Here's how it went, so far. round 1:
"here we are in the big stripy bed, dd.(not bedtime, just a visit) here's Max and White Dog and Dollies and Big Teddy. You love them, don't you?"
"mm-hmm!"
"What else do you like, to help you feel all snuggly?"
"mummy!"
"erm, ok, what about Toby?"
"no. mummy!"
etc.
Round 2 (at bedtime)
"Here's Max, Dollies, Big Teddy, and White Dog. Who would you like to snuggle?"
"mummy."
"yes, but who else?" (she's gone through phases of being inseparable from all these creatures, so IANBU here)
"no. Go away, Max (fling). Go away, Dollies (fling)."
"What about White Doggy?"
(dd arranges white doggy down on pillow beside her.)
"Oh, that's nice. Are you going to give White Dog a cuddle later on?"
"No." (fling)
And that's her in a GOOD mood!
I'm not giving up, but I wanted you to know what I'm up against 