Addendum: I tried it again (for like the fifth time), this time getting into a fight after loading my save and then facing Baal and not using the stash after beating him. Under these conditions, the hang did not occur. Now I'm watching the credits roll, so I'm not in any personal need of a fix...