The fundamental SaaS lock-in comes from bundling two things:
1. A declarative, stable interface
2. An expert support/ops team
I think the path forward is to unbundle them.
We're already solving #1. Nix has the best potential to become that declarative & stable layer, letting us reach the goal of treating cloud providers as the simple commodities they should be (I wrote about this approach here: https://ryanrasti.com/blog/why-nix-will-win/)
The bigger, unsolved question is #2: how to build a viable business model around self-hosted, unbundled support?
That's the critical next step. My hunch is the solution is also technical, but it hasn't been built yet.