Apple has already released a fix for the screen issue, with a longer cable less likely to break. This was months ago.
They have also never said that 2 and 3 keyboard were fixes for the keyboard issue.
I am surprised someone in the business can be so far behind the news.