the 2 pin connector above is a jumper that goes to the Tach wire. The solenoid should come right off, another diesel guy on facebook had to replace his.
Sounds like the solenoid is the failing part. If it cuts off try dumping water to cool just that solenoid. In theory you shouldnt have power loss but complete loss if it fails