6AN Is what most guys use. Seems to be plenty for efi to support the power.
The in tank pump is a great idea. We typically sell the aeromotive drop in pumps. But they are more $ than both the fcc or frame rail pump. But yes I prefer and like the in tank pumps also. Definitely keep it if u got it, as long as its over 58 psi.