I had the same problem - it would lock up every time at shutdown/restart. I ran the complete Conflict Catcher test and discovered that it, of all things, it was the "Speakable Items" extension that was the culprit.
I haven't had the problem since disabling this extension.