What can you really theme a GOOD Toy Story land too besides the rather cheesy "Andy's Backyard" theme?
(I agree though that the IP has been sprayed around too much... Buzz really needs to go from TL)
I would have consolidated Buzz and Monsters to Pixar Land and then built a solid dark ride or two in Tomorrowland that fit the theme better.