[Dragsinger]

Rick,

just something to look at,

consider keeping the factory tank and adding a sump area to allow only running a few gallons. Maybe add an extended pickup tube from pump to sump. Doing so also gives the option to add more fuel if some temporary ballast is needed.