Locking up after Windows 10 May update and Nvidia update

Last week I got both the May Windows update and the Nvidia update to support the May update and after that my computer started locking up at random. I think I've narrowed it down to when I have a streaming video either playing or paused in a chrome tab (I haven't tried it yet with Edge). I've tried reinstalling the Nvidia drivers as well as tried running on the older drivers and had the same problem on both. I tried to rollback my windows install but it looks like it didn't create a restore point prior to the update so I can't even go back to before that was installed without nuking my computer. Any ideas on what could be the problem here or where I can look? When it locks up I can use the ^ to look at items in the task bar at the bottom right but I can't open anything and can sometimes open the start menu but when it does open I can't start anything. The task manager freezes as well if I already have it open. I've also run some CPU/GPU benchmarks and it doesn't lock up so I'm pretty confident it's not a hardware problem.