Why fit a tank with an internal pump if your standard tanks still in a serviceable condition ?

If it was me I'd stick with the external pump set up & fit an uprated pump to that possibly a standard cosworth one would be man enough for the job ?