How about allowing all water surfaces to be used as terrain shaping coverages so that the underlying elevations of the terrain can be made flat? Otherwise, default models from the Model Builder often have "lumpy" bodies of water due to the fact that default elevation data is very approximate in nature and often incorrect near shorelines.