Fuel tank mod-in tank pump

I'd contact Tanks, Inc. They can either modify a (new) stock tank so you can install their kit with a Walbro pump, or they can sell you another new tank set up for other in-pump systems. I used the first option and it worked out great.
http://www.tanksinc.com/