Oil Cooler (again)

We pulled the oil cooler apart again yesterday. The o-ring seals were perfect (yay, we didn't screw up) which means the water was getting in through the cores. So much for that repair! Will be throwing them back at the shop that "fixed" them to try again, and if that's no good then will have to consider replacing the whole unit with a new external cooler.