Merging Corps-a-corps and Displacement in any way is an absolutely horrible idea, whether it switches with each use or is distance-based. It would effectively mean we can't use either of them on any non-backstep-friendly arena, of which there are several.