Hmmm ...That sounds like she's having trouble getting to extending for first nap and then getting OT the rest of the day as first nap is so broken.
But whether the first nap restlessness is OT or UT is hard to say! Does she seem tired by 10? If so, my guess would be to try the nap 15 mins earlier and see how it goes, if she seems quite awake by first nap time, maybe try the nap 15 mins later? I think it's going to be trial and error to work it out but my gut feeling, given her age and that she is waking after 1 sleep cycle..would be to try the nap 15mins later if you think she'd make it to a later am nap.
If you're aiming for long am/short pm, I'd keep with 2nd nap after 3.5A time and give the 30 mins only and just try to sort out first nap. If we change too much at once it gets confusing as to what is happening!
At the end of the day, she seems to need 3.5hrs A time sometimes before she goes to sleep. I'd aim for that, so if you get a 4pm end to nap, try for a 7.30 BT (into bed maybe 7.15?)