Make sure that all water brushs aren't grouped together... if you group a series of water brushs in different locations/directions to 1 func_water, your map will end up flooding. Tie each brush to its own seperate entity.
Also a screenshot/better description of your map would help alot.