Ldp
2
Ehm, you’re not uploading every sub-2000 chunk of river separately, are you? That’s really not necessary.
Map the river as you normally would (I assume you actually meant waterway=riverbank?), but keep every way under 2000 nodes. Then collect all those ways and have them as members in a multipolygon relation. Set the member roles as ‘outer’, and the relation type=multipolygon.
Example on http://wiki.openstreetmap.org/wiki/Tag:waterway%3Driverbank