M.2 =/= faster. M.2 is just a form factor. NVMe are the fast bois, they also have nearly no benefit for gaming (although I haven't tested if it makes a difference for SC in particular).
I would just wait to swap the CPU/mobo/RAM, maybe when Intel moves to a thinner chip (I think 10nm is the...