As someone who had 3 replacements (needed a 4th, but traded it in before that) on my 2017 MacBook Pro, I got a 16" mid April and the keyboard is much better all around. I'm no longer concerned about the keyboard having issues like the last. You will be happy you waited for them to replace the butterfly keyboard. Enjoy your new computer when you get it.