Slightly OT however for what it’s worth the new 16inch MBP with a redesigned non-butterfly keyboard is supposed to be available soon.
I would suggest you hold off any laptop decision until then.
The first hurdle for me is still whether it has an Escape key.
Get yourself a clutch :) https://github.com/alevchuk/vim-clutch