(edited by Minefa5)
Obviously Pit would reprise his role as Swordplay champ since he's the WSC equivalent of Matt.
I think Joseph, Massimo, or Mark would be a good champion for Basketball. I think the rest would be Xixi, Pian-pian, Laura, Ilka, or Matt (WSC) for Table Tennis, and maybe Clara or Se-young or even Araceli for Cycling.
Write your suggestions below!