Regarding the video, while in the tank, I would replace the fuel filter sock on the pump. Also, I would carefully inspect the tank liner for evidence of liner flaking off the steel tank.
Also, clean the fuel float potentiometer. Some owners have reported poor fuel level indication due to the potentiometer being fouled with sulphur from the fuel. A pencil eraser is used to burnish the potentiometer coil.
Also, I would carefully inspect the fuel lines for deterioration and replace as needed with the correct SAE rated fuel lines (SAE 30R10) appropriate for submersion in fuel.
Be sure the new clamps are FI rated. Worm gear style clamps are not recommended.
Oh, and careful with the six 8mm bolts that hold the pump plate in place...do not overtighten and break them off.