I can't comment on your choices- but I will say this about getting to the park early. I was at Animal Kingdom on day 2 of the opening of Pandora. It was complete coincidence, but they had extra magic hours starting at 7.... so for us that meant getting on the first bus out to have a chance to...