Did you look into using the vector OSM files for extracting water directly, rather than the raster-based tiles?