Follow up to the Fast losing control thread

Sigh. Ok mostly good stuff.

We moved bedtime from 9pm to 7.30 pm gradually. Introduced a wind down routine and started letting her phase out the moring nap. Result: Wake up at 7 am, 30 min nap at 10.00ish, 1.5hr nap at 1.30ish and bed time routine starts at 6.45 with bath, bottle in dark room and a book (which she is now insisting on! yay!). Amazing effects of this change: She is calmer, can sit through a book (in fact loves looking at books now), can watch more than 2 mins of baby tv, sits in high chair, eats better, less crying all around.

I decided to let go of the potty issue as its just not important right now and she screams when we put her on it. Dont want her to develop a major aversion.

Problems:
She wakes up every 30 mins during naps and needs to be helped back to sleep! She wakes up every hour or two at night and wants to be rocked back to sleep. These are both relatively new things. She was a good sleeper (once a night) till a month ago and we said it was teething, but now it is a nightly routine. We are just exhausted and I pray every night that she will give us longer stretches BUT that is just not happening.

I want to pat and shush but she is too mobile for it, she will sit up, crawl into my lap if she has to. She is already on a bed. If i put her in her crib, I cant lay her back down as she CLINGS to me like a little monkey.

Thank you for all the advice ladies about bed time. You were all right. 9pm is too late for kids and deep down inside I knew it but was under pressure to keep it late due to DH hours (and of course MIL being the cow she is... tells DH who discusses everything with mommy... DD probably needs less sleep... grrr.. she is coming next week and I hope it is a peaceful trip).
I have an apt with Cecile to help, but I do know she advocates CIO and maybe it is the best thing in this scenario but I cant imagine DD crying for me and having to deal with the realization that I am not coming. She has already become super clingy as DH's travel schedule has gone into overdrive.

What do you ladies suggest?