The newer pump assembly would probably work. The big plastic can acts as the baffle. The return line keeps the plastic can full of fuel even if the 'outside' fuel level is much lower. There are actually two pump strainers involved, the one you can see on the outside is not actually the pump inlet per se. You can mod an earlier style pump into one. I took apart a '94 model assembly and used a 'turbo' pump i got off rockauto for $8 to fix a 3.8 van a few months back.

I think the tanks are the same other than the fuel sender being built into the pump assembly instead of a whole separate unit like the first gen vans. However i dont see why you couldnt leave your fuel sender in place and just ignore the one on the newer pump assembly.