I'm about to do an alternator overhaul on mine later today - X5 3.0d 2003

It's fine currently, but with 130K I'm doing as a preventative maintenance - I've got the full kit, slip rings, brushes, new bearings etc.

I've got new belts - but I'm now thinking while it is all apart of also replacing the water pump and thermostat ?

These are currently original but again I've had zero issues. I've heard the 3.0d water pump is actually very good are rarely breaks/leaks.

The car isn't a daily driver so I'm not dependable on it.

Any thoughts on whether I should replace now or wait until it fails ?