It’s a little difficult to see from your pictures, but it doesn't look like you're using a bypass hose with your current setup. I know there are folks that say the bypass hose isn’t necessary, but I can tell you from personal experience overheating problems can occur without the little rascal installed.

Hopefully your issue may be simpler to fix than you think … it may be worth a try.