I've been through a similar thing with C at that age. I ended up putting him in a bed and he slept a lot better. I could also lay in his bed to help him get to sleep and then sneak out.
She could be teething too. The molars and eye teeth knock them around a bit.