Hi,
Excellent write-up here. Think you should find all the information you need... http://www.bimmernut.com/forum/showt...ght=water+pump
Would recommend if you suspect the thermostat to be faulty to change this at the same time, save having to drain the system again.
HTH