Err, have you ever bought a first-gen Apple product? Not something you walk into lightly... Apple has a tendency to let customers find their flaws rather than actually test for them and shake them out.

I'd rather not volunteer $3000 to be a guinea pig for Apple's keyboard design gremlins. If they went back to the 2016 model and just slapped a new motherboard inside and made the battery larger, then yeah, it'd be a no brainer. But I can't imagine them being that smart about it given the past few years of evidence to the contrary.