Ki-Adi is so underrated, He's contended with Grevious while exhausted and being unfamiliar with his style, has shown himself capable of powerful TK, has contended with Ventress and was considered the only Jedi(At the time) to be able to contend with Sharad Hett. If Ki-Adi was able to last the longest against Grevious while tired, There is no doubt in my mind that he would be able to best Grevious if He[Ki Adi-Mundi] were fully refreshed. The same could be said for Shaak Ti.(I'm not gonna wank her, same tune, different thread etc)
I'm siding with team 2. It's a good fight though
I don't just Wank Jaden Korr and Shaak Ti 😉