I had a similar problem when trying to root my phone. I was able to get mass storage, but i couldn't get adb to work. I uninstalled all the galaxy s drivers then plugged the phone in, went to device manager, and upgraded each driver manually. My computer now connects to my phone without a problem.
On a side note, try turning dubugging off if it is on. You are selecting the turn on mass storage button right?