I agree with all options, however the root cause is dirt in the fuel tank. Sooner or later you will get engine problems due to blocked filters. And yes, the engine dies slowly but sometimes at moments you don’t want it to die. Now Bavaria’s have big fuel tanks so this is a job you will need to prepare. Consumption of 200 litres diesel with D2-55 iso D1-30 saves a lot of engine hours although you will not need to complete the tank in full. On our previous boat I used a vacuum pump to suck out the dirt through the manhole. Dirt gathers at the lowest point and with the vacuum pump it was easily done.. perhaps worth considering as well?