Idle issue with 2.7 taco after engine swap??

Hi guys i recently did an engine swap on my 2.7 taco and everything went well, put in a new clutch and new radiator. When i first started it, it seemed to run really nice. but i noticed it idled at about 1500 rpm. this continued over the course of the day. The engine Rpms would dip to 1000 very quickly then return to 1500 when i pushed in the clutch while driving.

So i read online about the idle air control. I pulled the throttle body and cleaned the hell out of it. cleaned the idle air control which seemed to be stuck or very hard to move. i resealed the IAC with "the right stuff" because no one had the gasket for it. Next i put it all together and started it. also put a new throttle body gasket

When it started it ran around 1700 rpm then decreased to 1500. Next i pulled the MAF cleaned it and stuck it back in. The Rpms jumped all around after each start. 1200/1000/800.

I called it a night and figured i would try this morning. I started this morning it idled real quick at 800 then increased to 1500ish. I waited for it to warm up to see if it would close loop. it dropped to about 1200 when it got to OP temp. I turned it off and started again. THis time it stumbled around 600-700 rpm and didnt sound healthy until i reved it up and it stayed at 800rpm. Started again and it stayed at 800-900 rpm and would return there when i reved it up. it seems very sporadic.

anyways i am stumped...i guess it could be the TPS not sure. ANY help would be greatly appreciated. Thanks a million.

also the o2 sensor may have got wet with water while i was cleaning the engine during the swap. Not sure how much bearing that would have.