Same here. I have a MacBook Pro 2016 with AppleCare, that I want to sell before the AppleCare runs out (with some margin) and definitely before the extended keyboard warranty deadline is in sight. I am worried that, since these generations are plagued by keyboard problems, the prices will drop quickly.
I used to buy a new MacBook every 1.5 to 2 years. However, I honestly do not know which model I would buy. I do not want a model with a touch bar (I don't like the touch bar and it is slightly expensive). The MacBook Pro escape wasn't refreshed, it still has the keyboard without the silicon membranes. And the new Air uses much less powerful CPUs. Even if I would go for the Pro with touch bar or Air, I would still be worried that the butterfly keyboard problems are not solved, just postponed.
I agree that the Mac Mini looks like the only reasonable machine, performance-wise and quality-wise. Of course, it's not that handy on the go ;).
I'm hoping sanity kicks in by 2020 and there is a better keyboard. But I am not holding my breath, I'm sure they'll double down and have version 4 of the butterfly keyboard.