So, yesterday after kempo training I made some cookies and then went to his place. I wanted to make sure he was all right; we discussed what happened, and when I told him that I was done with this discussion and that I'd forgiven him and was going to let it go unless he had something more to say, he just said "ok". He didn't seem okay at all. So I went to his place to check on him.
He was really happy that I came. Later that night I got a text saying "I was pretty pissed at you today, but now I just want to hug you. Thanks."
So, problem solved. We're awesome.