No communication skills? How much clearer can you get than saying what you said?
FF - you HAVE to stop sacrificing your integrity for the sake of avoiding conflict. You made him lunch, then got mad at yourself, then told him you were mad, and you had conflict. So what was the purpose in making lunch in the first place?
Going to a C is going to cost him a lot less in $$ than a D. Maybe you should put it to him that way.