1Password with WebAuthn 2FA is probably better (harder for generic malware to steal), and leagues more convenient.
Also, I was a long time 1password user, switched to my current setup after 1Password moved to the rent-seeking subscription business model with 1Password 7.
In terms of convenience, it’s even more convenient than using 1Password. The only minor hitch is having to key in the PIN for the Yubikey if I haven’t used it for a bit.
That said, your system is well past the point of "password storage is no longer the most economical surface to attack".