To decouple from the stonk market bitcoin needs to be unit of account. To make this happen a lot of work is needed to improve usability of lightning wallets. Looking at the price chart under self hypnosis all the day long is not enough.
Assuming LN is up to the job, of course.
Custodial most certainly is. Where will have to have improvement is in non custodial options. But I believe that WILL improve.
The part that bothers me, is I think it will continue to be a tiny minority that even cares about the difference.