I vote for staying put Nichole! Seems like the kids are excited about it, and like you said, Tom isn't much interested in switching and you aren't in LOVE with the idea of AKL without the savannah view. Getting to go back to Disney sooner (perhaps) would be more important to me! (of course you are talking to the girl who affords to go because she stays offsite, so maybe not the best person to give you the advice, but I know if I didn't stay offsite, I wouldn't be going back this year).
You are too funny with the switching!

It's just because you want your trip to be the best trip it can possibly be for your family! Kudos to you for always thinking of what would be the most fun!
Sara