Music replacement might help make the approach to Otoh Gunga better. Mario Underwater music or something?
For me, I haven't had problems with audio echo... but I have had distraction issues with the audio jumps, particularly where you've looped or repeated a few seconds. It really takes you out of the film, if that makes sense.