Bitcoin payments will always have a custodial component until someone comes up with a completely unpredictable revolutionary new idea that changes the whole game.