On the World Showcase trick/question, don't forget that two bus lines often service the Epcot Resorts area - Yacht & Beach Club line and Boardwalk/Swan/Dolphin line. Typically, the stops are right next to each other. So, when you leave Animal Kingdom, you can grab whichever gets off first and simply walk to International Gateway. The distance from Boardwalk to the entrance and Yacht Club to the entrance are about the same. This is typically how I get to Epcot from MK, Disney Springs or Animal Kingdom, honestly.
I do agree budgeting an hour if you use the buses, just in case.