First off, thank you for sharing, yes, I agree with you, adding the M.2 SSD are awesome and FAST!! Yes, I am running a M.2 on two of my 3 machines. One has a Western Digital Black, another has the Samsung Pro version each at 500GB, my primary Editing Rig, also has an additional 23.TB of regular HD Storage, attached. My MB has the i7-4770K CPU @ 3.5GHz, with 32GB of RAM/Memory. The MB is a ASROCK, and the system is NZXT Liquid Cooled, attached with the Republic Gamers Video Card - 1060 - 6GB on board Memory. It's Supporting 4 - 24" HD Monitors. Two of the 3 Systems here are NZXT Liquid Cooled and yet with all this power in all 3 rigs, of which all 3 rigs are running an i7 CPU, Microsoft's Updates have still manage to turn my power houses into snails/turtles.
I have spent weeks looking for a fix, during the evening time, all to no avail. So that's when I decided to wipe my rigs clean, dependent upon which ones because snails as a result of the updates. Anymore, I just refuse to waist my time trying to look for a fix, I simply wipe my rig clean and before I install any software, other then the OS, I simply install every update, I mean all of them. At which point, I will load all my software back in it. At that point, I gain my super fast rig(s) back. Microsoft really need to get their act together.
If I had the extra funds, I would take every single PC I own, and get rid of them and invest in the Apple Mac Computers. I have plenty of experience on Macs and I really prefer Mac's over PC's, but for what I do and the fact that I have built every computer I have owned, minus the Laptops. It would cost me a fortune. None the less, I make do with what I own. I would be happy with PC's if Microsoft would do a better job.
Back to your point, you made an awesome investment, with the M.2 SSD. I even went SSD on one of my laptops, the other one by Razer came that way.
Hey, good luck, for the next update. I say that, because I hadn't even complete my restoration from the previous update, then got hit with another, only to have to wipe the dang machine again. This has been so frustrating for so many folks, it's a shame.