I ditched my PC a couple of years ago and now use a Laptop exclusively. Recently I upgraded to a 1TB SSD. Big increase in performance. What I have done in the past, and presently also, is divide the drive into two drives. In my case it is C:\ and E:\ with D:\ being the dvd drive.
Saying all that, only the Win 10 operating system and programs that are installed on the machine are on the C drive. Everything else is in folders on the E:\ drive. That makes it easy to make regular backups of the operating system. I don't know if this might help or not. Glitches are not fun.
That's my story and I'm stickin' to it!