Worth noting that the NHD has a specific attribute, something like 55800 Artificial Path (see table in wiki page), which is used for maintaining the continuity of waterways within reservoirs and lakes. It may be useful to mark such waterways in a similar way on OSM