Something that seems to work when the width of the river is larger than the river way, is when you are done putting in the natural water, add a river way that goes down the middle of the water and name it as usual. See the example in the coordinates below.