1993 grand cherokee stalls

I am having problems with my 1993 Jeep Grand Cherokee (6 cylinder, 4L, automatic). When the engine is cold, it wants to stall when I slow down almost to a stop & when I stop. I was having problems getting it to restart, but I replaced the starter/solenoid and that has seemed to relieve that problem. Before it stalls, it will shake (vibrate). It will not stall if I shift into park. After running about 20 min or so, I have no stalling problems. Can you give me an idea of what the problem could be. I am guessing it is the torque converter but is there anything else that could cause this problem before I wind up having my transmission pulled? Crank sensor or TCC?
Any suggestions will be appreciated.

Hi, well to put this out of the way the 1st thing I would do if you have not already is clean your throttle body. The AIS stepper motor gets sticky/gummy around 30k To avoid breaking anything. You should go to your local Mopar dealer and pick up a can of combustion chamber conditioner. Shake it well have the truck at running temp. remove the air tube from air box to throttle body. lightly take it above idle. aprox 1100rpm spray the CCC into the throttle body and matain just enough rpm to keep it running. spray all around the inside of T-body you will see a hole inside on the side this is the port your AIS gets its air.
Spray most threw that hole with little rpm as posible without stalling.
about 1/2 way threw the can stop spraying and raise rpm slowly to clean engine. ( note: will smoke alot at this point cleaning carbon from T-body, valves, intake )
finish running can threw eng. after finished do not clean eng shut off and let sit for about 5-10 min take this time to re-install air tube.
after 10min start truck you may have to hold gas pedal open slightly to start. drive truck and hit passing gear a few times to clear eng.
would not be a bad idear after to disconnect the batt. for 5 min to reset eng controller. hope this helps.