I hated that zone on live but mostly because it lagged and gave me a giant headache. But when I went there awhile ago for some nostalgia kills it was ok on modern hardware I guess...
But yeah, those water tunnels still suck.
Maybe you could remove it from the script of the non-custom npc. Oh yeah you could also fix the typo there too - griegsend is called "riegsend"