Put in the new fuel pump. Dropping and installing the tank, with about 5 gallons, wasn't that bad, but getting the fuel pump retainer ring off was a pain in the you know what. Fixed the cold start problem, and the gas gauge is reading differently now.
Before I dropped the tank, it was at 1/8, and post pump change, it's up to a 1/4. Filled the tank to make sure I didn't have any leaks, and am going to run a tank through to see when I run out. I get 265 miles to E, which is about 16 gallons (in the 19 gallon tank). Thinking maybe it'll just read more accurately, but we'll see.
Tomorrow is the rear main. I'm going to miss the thing, but this will not be my last TJ. Too much fun not to have.