Aoa is nice and big. I stayed in the cars suite once right when they open and I liked it and it was big almost too big but that's huge for only 2 people. The food court is nice and offers a lot of diffent stuff so I would pick AOA and the inside entrances are really nice and safe. The pool is so big!With what you listed, I would suggest AoA with kitchen if available. The pool area at AoA is awesome. Granted I can only say so because we walked from POP to AoA one night to look around.
Now PO Riverside is beautiful to the extreme. But sometimes you can be far from parking and it is spread out a little. But that is what adds to the charm. As for in room dining options, I am not sure of that anymore since it has been 20 years or so since I stayed there last.
No magical express for sawn and dolphinHave you looked into Dolphin/Swan? Often you can get in at a moderate price and the location can't be beat. Not as Disney but really great beds. There are resort and parking fees there though.
Register on WDWMAGIC. This sidebar will go away, and you'll see fewer ads.