I have a thread going on this, too. You describe a very similar set of symptoms. In my case, the dealer is replacing the heater core... that should be done this week (hopefully tomorrow) and I'll post an update.
/edit - i should add that there were no noticeable leaks from the core... the dealer says it was just plain clogged.
