I'm not planning to get a macbook. My main contender would be an XPS with a new ryzen cpu on 5nm, if they'll have one next year, or a thinkpad again with Ryzen 5nm. I would not accept anything less.
But thinking about it, it might be that the mobile AMD CPUs are a year behind the desktop ones. So next year the best ryzen could still be at 7nm Zen3. In that case apple will have a 2 year transistor lead. But, will see.