Looking improved water pump+thermostat housing 2009-4.2?

Hello,

My XF has a leaking water pump and thermostat housing. Those parts are largely plastic made. Cheap and unreliable for a car that price!!! I never replaced a thermostat housing on my '86 XJ6.

Anyway. does it exist a better replacement than plastic?

Cheers,

J.G.C.