To eliminate the possible htr core problem, bypass it with a section of regular htr hose. If it doesn't overheat anymore, replace the core. I'd put a new cap on the tank for sure, sounds like it's not venting. If this year model has the small metal pipe runni... Login to read more.