I’d consider that fine as is: A waterway=river, underground. The tunnel looks wrong to me. It is a series of caves, isn’t it?