Map Generator 2.0 - Please Critique!

Got the spline tool working with a water mesh:

Going to start working on a river generation system.

I am kind of torn on river placement though. I have 2 options, both with pros and cons:

  1. Flow the river through the middle of the hex.
    Pros:
    +Easy use of the current coordinate system.
    +River can bend in 5 directions.
    +Easier to make tile improvements like Dams/Lakes.
    +Easier to show rivers as a method of transportation and trade.
    +Easier to show rivers going around elevated terrain.

Cons:
-Trees, Cities, etc must be visually displaced to make room for the river. But this may already be an issue with roads anyway…
-More difficult to simulate attacking/moving across the river. Though attacking a tile with a river in it could be the same as crossing it in the other system.

  1. Flow the river along the edges of the hex.
    Pros:
    +Trees, Cities, etc don’t need to visually account for rivers.
    +Creates a clear line where attacking and moving is more difficult across the river.

Cons:
-Requires a modified, or even a completely separate coordinate system.
-River can only bend in 2 directions.
-Harder to show rivers going around elevated terrain.

Leaning towards option 1. What do you guys think?