Honestly, I think it's pretty obvious this is going to resolve itself peacefully, but in ANY case it's nice to see something like development. I have a feeling both of the issues are going to end up resolved at the same time... Honestly, I think Ookuma seems somewhat past caring about gender anyways.
That being said, I didn't actually expect this to go on this long without resolving it, so what do I know?