D&D 5E Substituting Hidden Shrine of Tamoachan for Orolnga [ToA spoilers]

[BMaC]

My copy of Tales from the Yawning Portal is collecting dust and I've just started DMing a Tomb of Annihilation campaign. I'm considering substituting the Shrine of Tamoachan for the Orolanga encounter. Obviously this would make the encounter substantially longer, but as I think it would work well as a set piece (I may shorten the time they need to spend in Omu as a result). Any suggestions on what I should do with the Guardian Naga? The party still needs to get the general location of Omu so I was thinking of having the Guardian be magically imprisoned in the Shrine of Tamoachan. Any suggestions on how to do this, or other ideas on inserting the Shrine of Tamoachan into Tomb of Annihilation?

 

[pukunui]

Since Hidden Shrine has much more of a Maztican flavor than a Chultan one, I had been considering plopping it down in Chult somewhere and saying it had been transplanted there from Maztica during the Spellplague. I'm not sure I'll use that idea after all, but it's worth considering.

If you want to put it in the same place as Orolunga, you could just say that there's more than one ziggurat. As the PCs approach the city, they fall into the catacombs of the Hidden Shrine, and when they finally make their way out, they can reach the naga's ziggurat next.

Or you could replace the bat god temple at the top of Hidden Shrine with the naga's temple.