Definately do something in the thermostat housing such as restricting the flow. I use a restrictor washer with a 3/8" hole to slow down the water flow, giving it more time to cool in the radiator, when i run gas. but most of the time i run alcohol where i have no cooling problem.
JMO
Zip.