Thanks guys for the responses.
But, just FYI, I just found this on the aeromotive website today. This looks like an awesome setup where you can keep your factory tank and just modify it for the pump. It also comes with the baffling that it needs. It's a little pricey, but for the convenience and the quality of aeromotive I'm gonna give it some thought. It's:
http://aeromotiveinc.com/phantom/