That... makes... sense. Oof, but that suggests their goal is to keep the ride as mediocre as possible to not generate too many crowds.
I love the Caballeros, and as someone of Latin descent I had the VHS and watched it plenty in childhood, but El Rio del Tiempo (while being incoherent to the average guest) had a lot of detail to look at. Gran Fiesta Tour simplified things to the point of much of the things to see being a quick animation followed by nothing as you wait, sometimes with the animation repeating before your eyes. I wish they got something better, so I hoped for Coco as a new try and forgot until these recent comments that while I was hoping for this in the moment we had the Brazil pavilion speeding toward possibility to take them into its loving arms.
Oh... Then the answer is simple. Swap them. The queue space and the final stretch of the ride would be a nice, large space for La Cava del Tequila while starting a new queue in the current La Cava entrance (which is conveniently right by the bottom of the entry ramp) provides access to the expansion pad. Run the boats backwards in front of the restaurant or have that be the ending.
But, honestly, this is more because I love La Cava and would love to see it more easily accessible. I would rather the expansion pad be used for a pavilion, but as was mentioned there's not a whole lot of chance of the Frozen expansion going away any time soon.