But that means making new phoens and getting them to market (and then to an affordable price), right?

If I was to make a deal with a manufacturer it'd be about releasing the relock keys for the firmware on extant builds, since there's a reasonable overlap between people who want to go to a phone for getting outside the Google / Apple ecosystems and people who want to get their already extant devices to last.