The heater comment was more about the oil cooler found on later 2F engines. You could connect it so there is no water flowing through it.
and......I don't trust most of the mechanics out there
I won't be around much for the next week or so but I could take a look at it after that. It is a lot easier to troubleshoot something if you can see and poke it a bit.