Finally, right around Christmas, she got into an interesting pattern, which we did not notice immediately; we would try and get her to bed around 8 PM or so, but she would cry and fuss and we had to go in and calm her and then try to get her to sleep again, which she would finally do around 9 PM. She would not wake up til between 7 AM and 7:30 AM. So we moved her bedtime routine and start her bath around 7:50 PM now and lately, she's been ready for sleep between 8:45 and 9 PM every night now. And of course she still cries some when we leave her in her bedroom, but she adjusts her sheets and such and soon falls asleep. She even wakes up occasionally to adjust things in her bed and returns to sleep without making much of a fuss at all. For the past 5 or so nights, she has slept the whole time from 9 PM or so until 7 or 7:15 AM.
She still takes a nap during the day, for about 1 1/2 hours, usually between the hours of 1 and 3 PM. She of course does not think she needs a nap, but once we get her into her room and tuck her in and leave, she cries for a little bit, but soon adjusts her surroundings and falls asleep.
So she regularly gets between 12 to 13 hours of sleep a day. I think her sleeping habits have become normal finally, and hopefully, with good health, these patterns won't be disrupted again too soon.