Akershus at epcot is lovely and they do a princess parade. I personally think at that age it's a bit less intense and therefore probably better than the castle.
If you want to do another disney dining hollywood studios does a disney junior lunch which has sofia and doc, and it also gets you fast pass plus for fantasmic. We really enjoyed that but it is loud as mainly under 6s!!!! Good food though.
Doc mcstuffins has a meet and greet in Hollywood studios and they are usually short lines.
Same as a pp I would take the pushchair too. We parked it up a lot and just remembered the basic zone but it was good for a sit and chill (some days we walked around 8 miles!!!). It also meant we could take a cool bag underneath with frozen water and some fruit as the snacks were pretty unhealthy and sometimes dc just wanted a piece of fruit and crackers for lunch. We also took a change of clothes so we could do the water play.
We bought some things cheaply here to have in our bag when q's got too much like princess bubbles or a little ariel torch for the evening in the parades just because it massively cut down on costs but of course we still got the odd massively overpriced item!
You can meet pocahontas at animal kingdom which is a lovely meet and greet.
I would second the magic bands. They make it so easy.
My top tip is to buy a red jewel/crystal and have it in your bag on magic kingdom day. In philharmagic (a sort of dated 3d show) ariel 'throws' out jewels. Bingo 'catch' your jewel and excitedly show your daughter that you caught one. She'll love it!
Oh and since she likes tangled, just past the above (to the left with your back to philharmagic) the toilets are in rapunzels tower and the area is like the village. Lots of photo oportunities.