73-87 LQ4 6.0l swap - Fuel tanks - Poly or non

[Jeckylll]

Started the tear down, 1977 reg cab 4x4 1 ton (cdn forces spec).

Bought a donor truck, 2000 GMC with 6.0L.

now starting to compile the parts list.

First on the list is new Fuel tanks. In my mind the idea situation is poly tanks with in tank fuel pump. I have a few vehicles an sometimes they sit longer than they should so I like the idea of no rust poly tanks.

I know if you buy a tank for a 1987 it has baffles in it to prevent sloshing and starving of the pump (at least that is what i think they are for).

I can't seem to find anyone that sell a 1987 poly tank with baffles. Can someone point me in the right direction?

If there isn't such a thing then i have plan :

B) which is either 1987 metal tank
C) poly tank don't worry about baffles
D) external fuel pump or other with poly tanks.

Any advice would be appreciated.