You're right. 2FA is convenient as hell until biometric authentication will do it with user's consent ( just tap something ). Yubico is quite near this target, but fragile usb dongle hanging from the side of your laptop isn't still optimal. FIDO is doing great work trying to bring secure authentication on the market, but the risk is that it'll be another complex OpenID which is killed by the giants ( Google, M$ etc ).