Hi there,
So sorry for not getting back to you for so long. I missed this in my unread posts
How are things now? Any change?
It sounds from your posts like she's probably getting OT, especially with the upset mornings. When a LO is OT they can often have EWs. Since she won't sleep in or do a longer nap, I'd be inclined to try EBT for a few days to see if she'll tack on some extra sleep at the start of the night IYSWIM. This prob won't help the EWs but at least she'll be getting a bit more sleep (hopefully!) so she might be less grumpy in the mornings.
In addition, you mention WU has been getting earlier and earlier the last few weeks. I wonder, could this be related to the sun coming up earlier where you are? Does she have blackout blinds? If not, and her room is getting lighter earlier, I'd give blackout blinds a try to see if that can help.
Do you stay with her when she EWs? What happens between when you go in and the sun comes up? Does she settle independently at BT and for naps?
I'd give EBT and blackout blinds a go and see if that helps. If not, we can have a think for more ideas. Wake-to-sleep (W2S) might be worth considering, for example.