I think you're right (and I think has been broadly summised elsewhere in this thread), but I think the bigger question is - how did it get to this point?
Someone like Universal, with the money/creativity/experience/intelligence that they hold as one of the world leading attraction designers and operators, somehow didn't factor this in? I find it really surprising that they chose this model of ride knowing that they'd need to neuter it in this way, OR I find it stunning that they'd have gotten so far through this project to miss this critical detail, AND I find it slightly odd that they didn't just pay off the contract severance clause with Mack once they did find out.
Just all in all a very strange situation they've ended up in.