I think $2k for the water pump and expansion tank is waaaay too much. Although I was quoted by an indy shop for $850 for the water pump alone plus the cost of "Porsche Coolant" which is priced similarly to gold IMO, so I can believe that that's what they charge but you could do this yourself for a fraction of that. I have not replaced the expansion tank myself but from what I hear it is a DIY job. I have done the water pump myself and it wasn't as hard as I thought that it would be. I sourced the pump from suncoast porsche (not affiliated) and it took me about 3 hours because it ended up getting dark. I would recommend you check out pedros garage website and see if this is something that you would like to under take. He has write ups for both the water pump and the expansion tank. Both of these installs could begin and end in one weekend day providing that you are somewhat of a "handyman". Good luck and don't let the stealership rip you off.
