why not just use a 1987 (same body style and accessories) tank, sending
unit and upgraded high pressure pump?
the sending unit will allow you to use the OE cluster and gauge.
the pump access will allow using an in-tank pump. plumb a return line
and your fuel problems are solved.

airdeano