EFI fuel tank module for stock tanks

That is true. Ill think about that. I am using the stock hole with the OPs hack, but I had not thought about contamination. Putting in a baffle at this point for me is no biggie. I guess the benefit of an in tank pump for me is ability to run EFI and have it be more quiet than an inline (not that your design has an inline, just that it is a usual alternative with various aftermarket EFI solutions). Ill check out the surge tank design you wrote about. So to be clear, a surge tank could be a 1 gallon fuel cell tucked under the front fender that has a submerged pump? and the return line from a fuel rail or TBI back to cell and then back to tank? Sorry if Im not getting this right at this point, new systems for me. I have not run return lines in the past, just dead head situations.
Thanks!