You might want to consider Boardwalk as well. Some outside the park dining options and Jellyrolls is right there for evening entertainment. Of course POR has Yehaa Bob too who I hear is wonderful as you probably know. Also Boardwalk is nice cause you can walk to Epcot and Hollywood Studios.
I...