I think you nailed it, with a bad water pump.

Possible the fan clutch is bad as well, but that would not cause the coolant leak.

__________________
Gary
Experience is something you get, Just after you needed it....
'99 E300 295K, '83 300D 220K, '75 240D 185K sold
'80 MCI Bus Conv DD 6V92TA, w/4 cyl. Kubota diesel GenSet 12.5KW