Im having heat issues with my 2.1 zvh, on a long run its fine, motor ways fine, general cruising is sweet, but as soon as i do short full boosts it gets realy hot

pretty much at the top of the gauge.
Would i benifit from a oil cooler ?
Turbo cooler ?
Disconecting the water feed from turbo ?
Any info appreciated