Your (3) is good and I'd note:

The passphrase with the executor doesn't need to be 'labelled' as such; it can be included in a private letter, sealed, that the executor is required to hand to the beneficiary.

The one further thing I'd add as a "just do it right now - today", is to make sure your spouse/loved one(s) know who your trusted bitcoin fren is.

Grief is incredibly stressful, and having a trusted bitcoin person help them with bitcoin-related matters at this time is important. Too many Reddit posts from grief-striken people: "can someone who understands bitcoin help me understand what to do with these 12 words my spouse left me"? Tragic .. gone in 60 seconds.