My two cents... Find a travel agent, and book through them, so they can monitor for prices drops, and also have them figure out your fast pass situation.
You want fast passes for the new Pandora ride in Animal Kingdom. It's fucking badass, and the wait time was consistently between 3-4 hours.
Agree with Sani on staying on site. This will also get you extra magic hours, so you can get into the park early, or stay late. This is important at places like Animal Kingdom if you want to ride Pandora, or at Hollywood, where the new Toy Story land opens later this week.
Bring your own water bottles. Water there is 3-4 bucks a bottle, but there are free water fountains all over the place.