I would go intercooler route, and a decent one. Pump wise on the Charge cooler, I fitted a Volvo 440? (the one that looks like a wedge of cheese) coolant pump as the pace one packed up and was £140 to replace, £15 pump and it belted the water round, Volvo so reliable and it was smaller so tucked away nicely, would still go the Intercooler route though, far more simple and less to go wrong.