Yeh... this seems far more complicated than the original in the wrong spots. Hiyama was always pushy and extreme but this whole plotting side of her is an awful new trait.
The bathroom fight version on the original with Kimura hearing Hiyama saying to those girls "Kimura is my future wife" was way better and lot smoother, also felt quite natural than this.
Sadly the original stopped when was in a great place. This serialized version is by far not as interesting. Im out.