Everything's back in, full tank, and no leaks. I re-used the rubber bumpers that were on the original tank, as well as the filler grommet, straps, and hanger bolts. The plastic part of the fuel pickup was cracked, so I ended up busting that off the rest of the way and replacing it with a piece of 5/16 fuel line.
I can't believe these old fuel lines weren't leaking, they were cracked up pretty bad.
Here's the new routing of the fuel lines.
And I installed an inline filter just before the fuel pump. Because of the length of the filter I got I couldn't come up with a place to mount it near the tank that I was comfortable about the lines not kinking up. Seems to be working good so far.
Has anybody ever actually got 25 gallons into one of these tanks? Supposedly they're 25 gallons from what I've read, but I couldn't have put more than 2 gallons in it out of my can, and it took another 18 at the pumps before it clicked off.