U2F would be a much superior replacement for any idea in which the user has to enter anything at all. It’s better to have the security hardware, such as a U2F key, authenticate the authenticator using cryptography, because that process cannot be man-in-the-middle’d.