There is a good article on this at StolSpeed.com A water thermostat will help with the water temp but Even a water thermostat won't help oil temp much but this video has a good idea to help at the 9:30 mark, a water to oil heat exchanger.
You are Welcome