1990 3.1, runs fine cold, stalls when warm/going from P to D NOT torque conv solenoid

[sampkamp]

This has been driving me nuts for a few weeks..

1990 Grand Prix 3.1. The car starts and drives fine till I arrive at my destination and park it. When I go to leave it stalls when put into drive unless I give it a good amount of gas.. and will sometimes stall at low idle AFTER it has stalled from going into gear. I UNPLUGGED prior to this the torque converter solenoid (which fixed the transmission shaking problem) so I dont think its that. It idles fine normally so its not an IAC. I got a code 23 which is either a bad Air Temp Sensor or a bad MAP sensor ( I dont have a book and found websites that have different answers, can anyone confirm what a 23 is? ) Im going to guess its more thank likely a bad MAP sensor...but I really dont know which is why Im here asking. This problem ONLY happens when its warm and MOSTLY when going from P to D... but will sometimes die while rolling at low speed and not giving it gas even if I am going faster than idle (ie my driveway is a hill and it died coming down it ) Also the transmission shifts fine and the fluid is the right color and smell so I dont think its that either.
Thanks

[sampkamp]

My cars trouble code (23) tells me I need a "intake air temp sensor'.. but when I search advanceauto's website two types of air temp sensors come up:
Air Cleaner Temperature Sensor
Air ChargeTemperature Sensor

Which one does my car want? I assume the charge temp sensor....Anyone know? Also, is it likely that this can cause stalling of the car when its hot?