If every user is non-custodial it means every user is capable of running an infrastructure. I don’t think it’s much of a problem. Plebs understand shit about plumbing but they all plumbery at home.
I think we shall not look for scaling without being able to scale self custody. It makes few to very little sense to me!