This is exactly the kind of things he shouldn't be doing if he wants her to give up on him. Of course, we all know that in reality he is just enduring until she graduates.
Nah, Fujiwara took Waaay too much useless space, she needed to leave the story as soon as possible.
Nagisa was really a side-character since her introduction, she probably will be the next one to go, but she need a bit more of character developement before she's rejected.