If the problem is just overheating, why not upgrade the radiator and radiator fans. You could also throw in an oil cooler or two as well.