Surface water caves should spawn connecting with rivers or inside lakes.

As it currently stands, the surface water caves spawn locations are a bit awkward. They sometimes spawn in a middle of a plain, other times they cut through a montain. I think this can be fixed by having them spawn connecting with rivers or inside lakes. In my opinion, this would make their current generation less clunky and make more sense, while possibly fixing the problem where rivers are too short.