From what you're describing, I agree with you that your likely solution is more "heat sink reserve" (larger, more efficient radiator). All of the other components seem to be right on the money, so I'd think increasing the capacity and having a clean radiator should do the trick......time will tell