I can't reproduce this crash with the latest versions, and it's impossible to fish in the dark with issues like this (I assume it's still the deadlock, but please hook up the debugger to confirm this).
I've made some tiny changes that decreases the duration that the locks are held, maybe this fixes something.