You can opt for the late 87-90 wrangler tank which is EFI ready (baffled inside as well) and is a direct bolt in with angle iron to support the tank instead of moving cross members. The tank is small at 15 gallons though.
Starting with post #28 in this thread you can see how it looks and is plumbed.
http://67-72chevytrucks.com/vboard/s...d.php?t=427417
Post #39 shows the angle iron pix.