soft fork + hard fork or a hard fork that incorporates both at the same time. This is the project that you're looking for:
https://bitcoinec.info/this is almost perfect. almost...
its needs to revert all of segwit's "blockweight" aspects, and let EC determine the blocksize exclusively.
however their reasoning for letting segwit in AS IS, is a pretty Fing good reason...
I like this project.