Here's a pic of the oil cooler and T-Stat insert as promised. You can see the tool that comes with the insert to put it in the stock housing. Water pump ordered and on the way. I went with the genuine pump.
JFP, Thanks for your input. As usual!!!
Randy