fuel pump issues!

[98-5.0]

hello!. ill start with my car. i have a 95gt wrecked and i am putting all the harnesses and my new combo into a 98gt chassis that is super clean. i know that the 98's had the stupid fuel system change. since ill be putting all 95 stuff in the car, do i keep the "weird" fuel tank and put an aviator pump or gt40 pump in it? or do i just swap my 95gt tank into the car and run a regular 97-down 255 pump? thank you all so much