overheat only over 3000 rpm

If it was over heating before all the modifications with all of the stock equipment, then, instead of throwing money and parts at the thing, you need to use actual DIAGNOSIS. Try it. It works.