You're entirely right -- the "proper" way is to login with MFA, enable SSH, do your thing, and then re-disable SSH.