You currently have both machines right? But a kill a watt and tinker with it for a bit.
The newer generations get more and more power efficient so there is a good chance you’ll save money. Definitely will want to pull a proc though. You can also buy lower power CPUs on eBay for super cheap too. Then if you ever need the horsepower you can throw one of those back in. And the second one if you need it too.
NVMe is a technology. M2 is a connector type.
If you open one of those drives you’ll find NVMe tech. You won’t find M2 connectors.