I am still on 2-step because I like being able to restore access using the recovery key in case I lose all trusted devices, whereas with 2-factor you have to go through a lengthy process with Apple support. But I'm reconsidering this now due to the safer icloud.com login ...
You can add multiple trusted devices for recovery so you don't get locked out. You can even add your home landline phone. I also added my daughter's SMS number so I can always call her and get a code that way as a last resort.