Rock Valley Antiques makes stainless steel tanks that can have the pump in the tank. The cost around $850, which is the tank with a baffle installed and the pump in the tank, made to your specifications. There website is
http://www.rockvalleyantiqueautoparts.com/ndex.htm