I don't think non-custodial solutions are going to be too expensive. Like I said the building blocks for proper scaling are already there & from the rumors I have heard even some of the newest ones are already being put to use in major projects.