Black Screen of Death issue...

I'm running a mid-2012 Macbook Pro Retina and went to update from Yosemite to El Cap 10.11.1

I'm getting the black screen with the cursor visible, that I've noticed other people having the same issue with as well. I've also already reset the SMC and PRAM.

The only way I can get the computer to boot to my actual desktop is by booting into Safe Mode (holding shift on boot). The strange thing is that when the screen is on the black screen with cursor, I can screen shot everything, and then view those screenshots when I boot back into Safe Mode.

I've also been able to get my computer to brick itself to the black screen with cursor state by going into my System Preferences - Displays - and select the Scaled, More Space option. This obviously while in Safe Mode.

It seems to me that my issue (and possibly some other people who've still had issues) are tied to the display somehow. Does anybody have some input that can help get my computer running correctly? Thanks!