I've already got it out. It's a radiator shop now. The pipes weren't leaking on mine it was the core itself.
I was thinking about making up the difference between double row and single row. Didn't know if the pipes come out of the firewall in the same place though.