Agreed that Kurogo should go back to OH. If Kurogo starts, Ishikawa can sub for her or viceversa.
As for Ishii... I think they should just invest on someone younger, they really need continuity. There's no point in using people in their 30s who are likely to retire before Paris 2024. Momii, Koga, Ishikawa, Kurogo, Yamada, Hayashi will still be playing by then