I plan on going with a EFI system as well. I'm thinking maybe Fitech, it seem as though they have it figured out. I've seen on Buick forums where people were doing LS swaps and getting their tanks from Tanks inc. Perhaps they could help or at least point us in the right direction.