It is a no brainer in theory but not in practice unfortunately because as others have also pointed out, it seems like the space in the Mexico pavilion couldn’t handle the (significantly busier) queue if they rethemed Three Caballeros to it. IMO that would be the best home for it simply because it’s already a built in attraction, but that’s the concern. Now I suppose they could put it in another park…but I really do wish there would be a feasible way to expand that building to accommodate a larger queue and keep it right in the Mexico pavilion.