stalling when shifting into reverse or neutral

My '96 cirrus has been acting up for a couple months now. Starting and driving is great as usual. Shifting while cool or cold is just fine. After driving 10+ miles and pulling up to the curb when I shift it into park (or neutral) the car may or may not stall. It always starts right back up and drives fine and it has never stalled while in drive. It seems to be shifting fine. It has also stalled while shifting into reverse (after a long drive). So far it's only occasionally annoying as I'm usually stopping anyway when I shift into park. It seems to be worse if I shift it fast as opposed to slowly.

I was thinking maybe a hose cracked somewhere but I talked to a mechanic and he said maybe the torque converter solenoid? Or the torque converter itself? The tranny fluid is clean with no particulates.

I'm not even sure the best place to take the car for troubleshooting this or what those two items should cost to replace (if that's the trouble). Or is this pretty much a transmission rebuild and I should drive it till it completely dies. You wouldn't know there was a problem until you pull up curbside to park. :-(