Agreed. Toy Story is honestly their most over-used and forced IP across the entire Parks division, IMO.
If they had the space, I would argue for a Pixar Lane with a focus on rides based on those movies. May not be enough space for that, though. Best case would be to extend from Toy Story Land all the way along the back to hook up with the path by Rock-n-Roller Coaster.