Davies Craig has plenty of electric water pump options. Not exactly cheap tho.
Davies Craig There are a few water heater options for diesels. One for a VW diesel should fit your motor size well. Core plug, some splice into a water hose. no easy links on those, sorry