Although the overheating could be caused by the fan / radiator don’t overlook the block passages being clogged. When I ran my 4.2 in my CJ7 I put a motorcraft,,, 2200 or maybe it was a 2500 on it and it ran fine at angles. Still have it and it has very low miles on it.