If Gavin is worried about not being able to fork after the next potential burst why not apply Justus idea [1], too much coding with not enough time?
[1]https://bitcoinism.liberty.me/2015/02/09/economic-fallacies-and-the-block-size-limit-part-2-price-discovery/
Because who pays for that coding? And who can be sure that the proposal, even if completed and tested, will be adopted?
Or if adopted that it would have the desired effect.
I see it as likely collapsing into the same sort of economically-optimized-by-centralization system anyway.