I replaced most of the hoses ... they get dry quickly here because of the very hot weather.

I think I will wait till the next service.

Do I need to replace the Thermostat as well? or only the water pump?

__________________
BMW 1M 2012 - Current
Jeep Grand Cherokee Limited 2011 - Current
BMW E93 330i Convertible 2009 - Sold
BMW E46 320i 2004 - Sold
BMW X5 4.4i 2002 - Sold
VW Golf GTI 2000 - Sold
BMW 740i 1996 - Sold