Na, Chihiro is a saboteur for sure, considering what she told Moko and that smug grin when she was messing with Kaede's hair while the couple are fighting. I want Moko's talk with Shiori to go well but have her say something like, "Doesn't you feeling and thinking this way about Kaede mean that you love her?" I also want the reveal for Chihiro to be, "Kaede is mine to protect from everyone!" rather than the more likely possibility of it her being in love.