Update, after watching a youtube video of someone replacing the parts, I thought better of it and order the whole unit, and replaced that, after a couple of leaks from hard to reach places I cracked it, and now touch wood all's working fine, with near instant "hot water at the touch of a tap"...