Could it be that CJ is just feeling that he's being pulled in all directions right now? (I think guys tend to really focus on one thing at a time.) It sounds like he's been really busy with his classes. I know when I was in school and was feeling overloaded, I'd get a bit irritable.
It sounds like overall, things have really improved for you. I'd suggest backing off a little, and seeing if he settles down a little now that some of the school pressure is off.
I think just the fact that you got a couple of e-mails is a bit of an olive branch.