Just thought I would share my day in case it helps someone...though most of you probably already know :-)
I had a really small coolant leak--1-2 drops overnight--I assumed it was the water pump going bad and leaking out of the weep hole, so I ordered a pump, thermostat, radiator, & hoses, just to do everything in one fell swoop.
Anyway, I finally got down to the water pump (stupid fan slowing me down), and it was fine. The part that was leaking was the outlet to the heater hose close to where it connects to the water pump. Its a few inches long, and had corroded all the way through in a couple small spots...just enough to drip $21 at the dealer. Probably worth it to just get one if you are about to do the same thing.
Oh yeah, '04 six cyl.