Re: Is there another solution?
Aikidoka have a bad tendency to resort to passive-aggressive behaviors. I am a fan of making things overt. You could have talked out loud about how his friendliness degraded to the conduct that he was displaying in class. He would then have to directly comment on what his intentions were and you could make your decision to stay, leave, etc.. You simply responded in kind to what he did. You gave him a taste of his medicine (he set you up for failure and you did the same to him). I would simply describe what he did and what you did to those who want to know. In the end, you were human just like he was.
To me, the real issue is whether or not you have learned something about yourself so that this experience becomes part of future wisdom enacted.