Warning: Car is overheating - Pull Over and Call BMW Assist!

[noelskii]

I got this warning message on Monday and I pulled over for 5 minutes and drove off (my house was less than a mile away) without the warning sign come back on. Car is 2007 X5 3.0 Si 81k miles

Today I dropped off the car at my local shop. I live in NY and I have a non BMW warranty called "Auto Source" (NJ Company). My warranty apparently covers water pump failures.

Question:

1. How does the shop perform a diagnostic on the water pump?

2. Should I take it to a dealer to have the work done instead of this indy shop?

3. Should I pay extra to have the thermostat replaced (hopefully only for part costs)?

4. Are there any other parts that I should have replaced while they change the water pump?

5. I have the lite version of BMWhatt - is there a code to look out for, for this waterpump failure?

Thanks!!