To be honest, I think they should invent a rumba rapids style ride, but where the boats are on tracks and riders are harnessed in restraints. The track could involve inversions, and troughs of water, plus the tunnel and everything else everyone like about Rumba.