Hi, I also had the same problem on El Capitan. Finally I reverted back to Yosemite via internet recovery at the time because of the freeze.
I bit the bullet and upgraded to sierra from Yosemite, but with a clean install instead of an upgrade, and I haven't encountered any freeze so far. So maybe clean install is the way to go?