Setting to "Unlock with 2FA" along with the current security unlock options

You are confusing login with unlock. They are not the same thing. 2FA only happens on login. See here for what you want: 2FA when 'unlocking'