Yeah, Kenichi's ending was definitely rushed, and it ended up worse for it in my opinion.
Still, I have no problems with this so far. Though it seems Erina's position as the new Headmaster isn't fully secured yet, if what she's saying is true.
And man, Tadokoro actually managed to get into Elite Ten. Sure, she's 10th seat, but still.