I'm still going with Caedus, you have to remember that Mara fought a completely unorthodox fight. I don't think Kyp is as strong in as many areas that helped her in brawl with Caedus, as surprise attacks,unarmed combat moves, not to mention I don't see Kyp bring a blaster,shoto and vibroblades which played big roles in that fight. This fight will be intense but I don't see Kyp surving.