I agree with Jimmcgee on jerry can fills.
First of all, you can get better filtered diesel @ a gas station, rather than a fuel dock.
I got rid of my electric fuel gauge after 2 burnouts and have my gauge @ tank top. At empty, I filled 6 gallons & marked the gauge with fingernail polish. Same with the other 3 six gallon fills.
I do prefer the top tank gauge with the markings. I no longer run the risk of overfilling.
Also to fix the burping problem, I ran PCV pipe from an area over the fuel tank to near the overboard fitting. I attached the PVC to the underside of the overhead & ran the vent hose thru this. This way, there is no sag in the vent hose to the o'board fitting & thus no burping.
CR