Is she happy and ready to go at that time or is she whingey, obviously tired and wanting to go back to sleep? If the former, the only thing I can come up with is that if she has finally caught up on sleep, and is over the OT, then maybe try pushing the nap out to 12 p.m. You could maybe even try 11.45 (slow and steady!) and then 6.45 bedtime. I wouldn't take a giant leap to 7.30 bedtime or anything, but try 15 minute increments and see how she goes.
How is she settling for nap and bedtime? Is she fluffing around or does she crash? We recently extended DS2's bedtime to 7 p.m. after he was faffing around bigtime and refused his normal bedtime of 6.30/40. Worked like a charm. He just needed that extra 20 minutes to get a bit more tired. But with Maya's history, I would tread very carefully and slowly. Give any change at least 4 or 5 days to take effect.
Looking forward to seeing what other suggestions you get xo