Well, neither of us were right... Turns out the fuel supply line had a major clog in it between the tank and filter. I thought I had it cleaned out well the first time I dropped the tank but I guess a chunk of something dislodged once gas was flowing. Got it blown out good and reinstalled the tank, the pump sounds normal now and it revs as it should. Still not idling right once it gets warmed up. Cold starts are ok. A little stumbly right off the bat but within 10 seconds it sounds good on a normal high idle. Once it warms up and the idle drops is when it really starts stumbling. I have replaced several rotten vacuum hoses already that seemingly had no effect on it. I have sprayed brake clean around the TB and intake gaskets looking for vacuum leaks and found no obvious ones.
Yesterday I thought maybe the thermostat was stuck open and it wasn't warming up all the way, so I changed the stat and topped off the coolant. Also threw on a new rad cap. Now I guess since the coolant is full and pressurizing like it should, a small coolant leak has surfaced from the water jacket between 1 and 3 on the intake. Great! It is possible the old stat was ok because the temp gauge still doesn't get higher than about 140, so I think the sender is bad now.
One thing I did yesterday was unplug the IAC while it was running and it immidieatly jumped to a higher more normal sounding idle and didn't stumble as bad. I don't know if this was because the higher idle was covering it up or if it was actually running better. Maybe it is bad.
I know i still probably need to replace the o2 sensor and make sure the cat isn't plugged. What else might could be causing this rough idle when warm?