Had a similar problem
Hi, I'm new to the site but had a similar diesel cutting out problem. Have you checked the air bleeder to the diesel tank. Mine was on a sailboat and near the backstay. A lot of varnish from many coats had accumulated and just filled up the tiny bleeder hole. Good...