Looks like it's fixed!
The primary culprit looks like a coolant sensor that was intermittently failing but not throwing a code. A lot of other things were improved along the way, the MAF was bugging out, and causing misses, an O2 sensor was a bit chaotic. Should run about as good as it ever did when I get it back. Hope that was it. Looking forward to a little romp time.