I don't think shoving can be resolved as an isolated "fix". The entire combat economy needs to be redone to incorporate everything correctly.
You eat an elephant one bite at a time. This is one bite.
Elephant isn't exactly delicious, we eat it one bite at a time because we have to. There's no reason a game's combat can only be altered one change at a time, especially if you already know your changes will leave vacuums in other areas.
