Hi Jem. IME OT wakings occur in the first few hours after bedtime & tend to be little cryouts where DS settles again fairly quickly, but just sounds a little unsettled, whereas UT would be faffing around at bedtime for ages, or long chatting NW or EW. So...I think last night the wakings before 11am sound more OT not UT. I also think today that if she were UT at naptime she wouldn't have woken at the 30min mark (30min naps were always a typical sign of OT for us) and if she were UT she wouldn't have resettled at all & she'd have woken happy. BT however could have been either - UT from short AM A & 12hr night previous, or she may still be OT. I think the night may give you a clue - if she wakes repeatedly in the first few hours after bedtime I'd say she is OT.
I honestly think atm your best bet is to try a routine consistently for a couple of weeks rather than switching between longer morning/longer afternoon every couple of days, as what happens today isn't necessarily just based on what happened yesterday, it may be the cumulative effect of the last 4-5 days IYSWIM? If you change things too often you can end up not really knowing which thing is or isn't working. I know its easier said than done though - I am also guilty of not always being consistent, but I will say it really does help more when I am.