If your going to fuel injection you will probably want a "fuel injection tank". The differance lies in that the fuel injected ones are baffled, basically looks like a cake pan in the bottom of the tank to keep fuel to the pump so that it doesn't run dry. As far as adapting a fuel pump to the sending unit, no problem. I used I believe an f body (camaro) to a 89 sending unit. The pump is made by walbro who makes bbk, accel and others. I got the pump for 97 shipped. Its the hi po 255lph pump. The only reason I used such a big pump is because the motor is a tpi 350 and I want to be able to adjust my fuel. You don't need such a big one for a tbi motor.
MPI wrangler tanks wont fit in a cj, i tried. I've looked at both tj and yj tanks and I think, can't remember for sure but I think the tj sending unit bolt pattern is round while the yj's are square.