Time for a cooling system refresh - OEM radiator still the way to go?

[Estoril]

OE.

[D-O]

Found a small puddle of coolant under the car this weekend. Opened the hood and found this:



Guessing this is a sign the water pump is leaking onto a pulley or belt.

With 95k and 19 years on the clock I am going to go ahead and refresh the entire system. Are any of the all metal radiators worth considering over OEM?

Any downside to replacing the belt driven fan with a SPAL 2082?

Any tips welcome.

D-O