An honest mechanic should be able to change the waterpump for less than $200. You're thermostat is probably OK, but they get changed sometimes because it's easier/cheaper than the pump when your guessing at what's wrong. You don't need a dealer for a WP change, which is not a big job and takes no special tools/equipment, as others have mentioned. If there's a garage near by, call them and see if they will change the WP on your car. No fancy testing, just basic mechanical stuff. Leave the dealer and save some money. I do think your temp sensor was actually dead from your previous post. (Hopefully thats all you'll have to pay for...)
The CEL light wont hurt anything and can probably be fixed for $2 - $200 depending on the actual cause(s). Lot's of folks can help you on these. See if the dealer knows the codes that the computer was logging if he tested this. (He may be guessing on this too... :rolleyes: )