Can anyone recommend a good replacement heater core. I tried one from O'Reilly's that didn't fit. The case would not close and the tubes were poorly positioned. So I got one from Autozone and had the same problem. The original GM core did not leak. But I intend to sell it so wanted to put a new core in. Thanks in advance.