I think the geometry should get done first...
How important is it to also correct the arrows?
are the color-mixed versions missing in your diagram?
How important is it to also correct the arrows?
are the color-mixed versions missing in your diagram?