I would finish flat flooring the trunk. Next I would fabricate my own under-floor fuel cell with a filler neck going to the factory location. This would be way cheaper than any aftermarket/efi tank. During fabrication you can make your own internal sump or baffles for the fuel pickup. I would run an external in-line EFI pump. I've used them in the past and I like them.