I think you'll be very happy with your switch. We stayed at ASMo last year with our ToyStory fans, and they had a blast! The staues are so big, and they loved seeig them all. There's also and RC that is the perfect size to sit in - a great photo op!
Andy's room is what the courtyard is called I believe. There is a big door leading in, and in side are all the character statues.
As for rooms, be sure to request the ToyStory building. We were able to get it without a problem, although it seems that's not always the case. Hopefully they'll be accomodating of your little princess for her birthday!!
Have a wonderful trip!