Punching him and y'all fighting it out might actually help the situation. Sometimes ya need to do the yelling and everything to really explain how angry ya are over what happened. And he might need to be doing it to you too. This advice is also why I ain't the counselor.
You and Illya just kinda need to establish some sort of boundaries, I guess.