Snapdragon Elite X Gen 2 laptops are coming out as we speak. Assuming you're not doing GPU heavy work (or gaming), that's what you should be looking at. They are equal to M4 performance. Personally I'd look at the new Asus machines from CES.

That sounds like just what I want, that ought to have great battery life as well. Very promising, if someone were to build a nice light laptop around it...