I got the NAPA pump. It was about twice the size of the Bosch one.
When you have the tank dropped, get the sender working then.
Do you have a dent in the skid plate cover over the gas tank? That could cause the sender to get stuck on that baffle that is in the tank.
Here is a pic of my fuel pump/sender unit...
The actual "pump" is that aluminum looking cylinder. But what I got included in the box was all the parts it takes to remount the new pump into that harness it is in.
Here you can see the bulge in the baffle that is down inside the gas tank. Caused by a dent in the skid plate. It caused my sender to not work.