I am going to foam in some rubbermaid 1Qt containers they are short enough that i don't have to cut out my tray
My fuel is in a 1.25 gal gas can with can fittings on the end. My tray is intact and the gas gan fits. You talked about a separate catch jug for fuel.
What I did was run a return line back from the outside of the box to the gas can. It works great. Overrun fuel pumps right back into the box.