If it ain't broke why fix it
I would take it to a good dealer have it serviced & let it go at that. My "old 5er (still use it for hunting trips 20+ years old) hot water tank still runs like a champ!
__________________
Roger, Cindy & Dawg
02 F250 PSD/07 CF29RK Cruiser
You can get there from here, it just takes longer