hmm...perhaps that A time is good, or at least close. I would try that A for a few days to see if things start to change, as it often takes a little time for their bodies to adjust.
your WD sounds good, but is she asleep by 9:30? The A time starts at the moment they wake, and ends at the moment she is sleeping. So if it took her 15 minutes to settle, was she actually asleep by 9:45?
some LOs are different regarding the following A time after a short nap. For us, if it is an OT nap I try to shorten the next A by 30 minutes (so if he is 2.5, then I make it 2 hrs). If it is a UT nap, I shoot for about 10-15 min less than the typical A. The way I know it's OT is if he wakes crying and UT if he wakes happy. Make sense?