Trooper RPM issue

89 trooper 4-banger. New top end. Everything looks good in and around the motor (hosed, vacuum lines, ext.). Cold starts doesn't seem to have any bump in idle like a choke would do and sits around 900 rpm and stalls. After the motor is warm the motor idles at 2200 rpm. Sometime after sitting for about 5 minutes it will kick back down to about 900 rpm and the check engine light will pop on. If i kick the pedal and give it a little gas the light turns off. Im thinking TPS?

Ideas?