Pervasive biometric security may be the next step. I know it's scary and could actually be abused but it also can generally increase the level of security for everyone.
If your password is leaked, then you can still reset it. If your fingerprint signature leaks, you're out of options.
Burn your fingers!
This may be an urban legend, but I've heard there was once a bank robber who dipped his fingertips in acid. After a few months, his fingers healed, and the prints were exactly the same as before.
Something like left eye iris scan for Google, right eye iris scan for FB, left index fingerprint for AWS?