I think the number of people who own bitcoin that self custody would be maybe in the 20-30% range.  I think it really depends on how unstable and confiscatory governments get and how obvious it is to the general public.  If the average person doesn't think their government is going to steal their bitcoin then they will probably hold it in a bank for peace of mind.