Heater Core Part Numbers!!

Ok this is for AMC guys. I dont know about the Mopar models. First and for most Proliance and Ready Air SUCK!!! Now on to my question. I have an '85 XJ came with a V6. THe Part # I got from Advance and Oreilly's is 399245, THIS PART WILL NOT FIT!! The Tubes are bent back at a bad angle and go through the foam pad at an angle.
Does anyone have a good part# from anywhere in the USA? atriot: If you do then please please poost it or PM me or call me 816-803-4699 Thanks in Advance!