I'd see if you can find a good set of tanks from an oem radiator, as they are vastly superior, and get it recored with a 3row core.

I'd also retorque the cylinder heads to try to save the head gaskets, as when the head gets hot, it bows, and it will stretch the head bolts and lose the gasket seal.

Not responsible for advice not taken...