Rebuilding heater box, replace core?

I replaced mine with a used tested oe one then it started leaking 2 months later. Now I gotta pull it all out again. I'd go with a new aluminum one.