My position is that, perhaps, one solution might have been a body of second thought, much like second bodies found in most democracies. IE Senates, Legislature/Congresses.
We could have a requirement of 51% of all active witnesses for code approval and only the top 20 to decide on a version for consideration as the next HF.
Anyway better minds may have a better solution.. Yet even if forked this issue must be addressed in future versions of DPoS.