Update:
I got a junkyard gas tank for $35 and spent about an hour trying to get it fully cleaned out. It had some sediment and gunk in it which concerned me and I still need to slosh a few more gallons through it for it to fully be cleaned.
I started to pull my tank and did notice when I pulled the fuel pump out that the strainer had fallen off. I'm going to try putting a new strainer on for COTA and run the old tank to see if that at least improves my pickup issues. If I can get the 94/95 tank clean, I'll put it in before Hallett.