Logically speaking Obi-Wan > Shaak Ti and many people say Kenobi didn't truly beat Greivous because he would've fallen to his death if not for the blaster. So Grievous should win but I still feel Shaak Ti being proficient in Ataru and her mastery of Makashi should be enough to at least stalemate the General.