You exactly said what I desperately want to happen in this series. Though I read Manga but don't worry I ain't spoiler ;)
I truly ship CHIHAYA with TAICHI. Because I have seen him supporting CHIHAYA like a piller. Its just chihaya a little idiot. I am hoping that they would end up together just like Kimi no todoke. Chihaya is surely a female shonen character, and I know she will gonna win this!