Just watched the raw of ep 40. It closes with Cagalli vs. Shinn by the looks of things.
I'm guessing I'm not the only one who's hoping she kicks his arse, rather than losing badly and necessitating freedom to deorbit to put shinn back down a few pegs.