Sorry, I forgot about a few things.

1) no codes, no lights.
2) I did pull and clean the TB at that time. Also cleaned as much of the intake as I can get to.
3) Cleaned the MAF at that time with MAF cleaner.
4) The 2004 is a Series 3, so it's an electronic control, no IAC.
5) Just had the whole intake (up to the TB) out a little while ago when I had to pull the rad fans. I found a mouse nest on the computer, but all else is good and clean.

So that leaves the TPS and temp sensor. Do you mean the air or coolant temp sensor? I guess the easiest thing is to try and clean the TB again and make sure the EGR isn't stuck open. Is there a diagnostic for the TPS, or temp sensor? I assume the the TPS should just read a nice smooth range as I open and close the butterfly. Let me know what to check off these and I'll just do it all at once.

Thanks for the tips and ideas.