I would re time the pump with a dial indicator back to factory, 1.54mm and put the boost pin back to stock. Then see what your egt's are. As far as the intercooler goes, I would see what I could do to get T1, pre cooler, and T2, post cooler, temps under load. Generally more inter cooler...