"that majority of remaining users consistently choose convenience over control. "

Out of sheer desperation, people will one day turn to the non-custodial wallets; all the better if those wallets will be easier to use by then. In a decentralized environment there will always be builders, cause it matters.