Just out of curiosity.
My DD is usually asleep for 7, but usually takes a nap at 5 for 30mins as she's so tired, and very grumpy between then and bed. Wondering if she maybe needs an earlier bedtime instead of a nap at 5?
She doesn't sleep great, up maybe 3-5 times between 7 and 6. Maybe an earlier bedtime would help?