I'm artificially limiting myself to changing the parameters of Segwit as it is.. 

This is motivated by the idea that a consensual HF in the current state would have greater chance of acceptance if it changes the minimum number of lines of code.