2001 SAAB 9-5 Check Engine/ TCS Off light, stalling

My question is two-fold, and not being a mechanic, I'm not sure they are related.

1) My 9-5 has had an ongoing issue over the last few weeks where it will not start after a short drive. After shifting the gears back and forth with the key turned to start, the car will start after 30-45 minutes.

2) Scenario 1 happened on Wendesday, and after I got the car cranked, the next time I cranked it, the TCS OFF and Engine lights came on, accompanied by a bad shake. Drove it home and when I went out to start it the next day, it stalled several times after a few seconds of running. Had to towed to a general mechanic (just bought the car a month and a half ago, don't have a Saab guy, yet) and when they got to it the next morning, it cranked right up and had no lights. I picked it up that night after they cranked it several times throughout the day and cleaned the connectors. The next day the same lights came back on and the car stalled twice while driving very slowly in a drive-thru and at a red light.

I don't know if this is worth mentioning or not, but I just got a new water pump installed the previous Monday and the oil changed, as well. Thanks for all the help you can give!