Her routine looks pretty good for her age. At her age, 1.5 for a nap is really about "average", so if she occasionally does 2 hrs, perhaps it's all working out anyway. Nights are usually 10.5 - 11ish.
My hunch is the frequent NWs are due to all the changes. I'd try to give her as much mommy time at bedtime as possible (I know that's hard), and be really consistent with how you handle the NWs. At this age, it's soooooooo easy to establish a prop. So I would suggest that you and dh decide on how to handle the NWs and stay consistent with that. We've found that extra cuddles in the night pretty quickly develop a habit. However, if she's having a hard time adjusting, you may want to make some allowances there. It sounds like you cuddle, and sing. I might say, just go in and ask if she's ok, quick re-tuck and out. And then wean back off of that as she adjusts to the bed and her sister.