I took the advice of several folks on the site and ordered the Bosch fuel pump off of Amazon.
There seems to be confusion on the strainer that comes on the pump, some say it doesn't fit in the TJ tank and you need to order both the FS 221 and FS 222 strainers in order for it to work properly...