I agree with with 2in. You've gotten every single idea out there short of pulling and replacing parts peice by piece. The only other thing you could do is bypass the heater pump with hose barbs and hose to see if the issue goes away. You're spending more time chasing it down than if you had taken it to the dealer a couple weeks ago.