I'd say OT from what you've posted the last couple days. I don't know that there's proof of this, but I tend to think NW/EW can happen at the same times during the sleep cycle and you have to take into account the routine and type of waking to try to figure out OT or UT. Her waking is happy, but you say she's always pretty happy. From the routine, I'd say OT. That was almost a 14hr day yesterday on just under 2hr day sleep. Both of mine would've had a short night from that.
As for routine, I think what you're doing is right, just on a day when she wakes so early, I wouldn't push her as far. Yesterday, she did a 5+hr A time before the first nap. If she's up that early, I'd let her nap at 10am still and then do your CN, but I wouldn't let BT go past 7pm.