>>23354960
>with minor changes
Clone Shouma survives and brought into Granute society with subsequent Bitter users (Jeebh can still be a Bitter) remaining as him. Leave Magen in the background for scenes with Bocca to clean up when Bocca fight is occurring. This makes Clone Shouma be the one who is defeated by Over Gavv. In the same episode it does seem to make more sense that since Bitter Gavv is when stress started piling up which made Shouma have difficulties making Gochizos, that defeating Clone Shouma being the episode where he gets closure on that and is able to make Gochizos again without issue would be a more organized way to match things up.
There's also an entire alt-series hypothetical that I might type out that follows a similar plot progression and themes with the same forms but in that hypothetical it would basically change the entire series. I do like Gavv but it is true that the early speculation on where it "might" go likely could have given its detractors something that they would have liked more.