OMG I forgot to tell you guys what happened:
Friday, I went up to him and asked him if we could clear the air. It was the end of the day, so I thought it was smart. If it went well, good. If it went badly, well - it was the weekend and I wouldn't have to see him until tomorrow.
So, he's says fine and we go in a conference room. I tell him that I am tired of his negativity and I can't tolerate his insubordination. He tells me that I should go #$@% myself and that he doesn't care what I think. I tried to stay calm and diffuse the situation. I told him that he needed to stay professional and that there's no point in being confrontational. We are both majors and need to work through this. He got up in my face and told me I was an ass and pushed his finger into my shoulder. I told him not to poke me. He did it again. I reacted. I grabbed his opposite wrist and pulled him acorss my body so I had his back. I jumped on his back and threw a rear naked choke on him while he was standing. I wrapped my legs around his waist and we fall backwards on my back. I sustained his weight and the blow to the ground hurt, but I kept the choke on and now hooked my legs over his legs (we train on this stuff twice a week). I grabbed his forehead and pulled back on his head, allowing me to sink the choke in even deeper. He starts tapping as we do in training, but screw him. He's going to sleep. I hold it until I'm sure he is passed out. Then, I take a black sharpie and write on his forehead, "This is what happens when you mess with the horns." An adoption of a great quote from Little Junior Brown (Nicholas Cage in Kiss of Death - 1995).
To be totally honest, when I confronted him, he agreed that he needed to be more professional and we shook hands. That was that. But I'm totally sure I could take him.