Hello. Thanks for mapping on this project.
A remark about tagging of waterways.
When a trace of a waterway is that wide that you cannot jump over it, tag it as a river. ( a bit strange, but this criteria is used at OSM)
Best regards