Stick with Pop. If it's just you on this trip, there's no reason to switch to AoA for a family suite. And the Little Mermaid rooms that you might consider at AoA are further away from the main building / skyliner.
If you go with a Preferred room at Pop you should be getting a closer building to the center, so that saves you some steps.