In the meantime I thought of another idea, which is to lightly toss off a comment next time you see him along the lines of "Geez, sorry I was in such a MOOD last time -- turned out I was coming down w/ a cold" or something like that, kind of in a laughing way -- then go do something else. OTOH he might not even remember the incident so you might not want to bother.
I tend to be an analytical type person myself so I recognize another when I see one. I have to warn you not to try to read ANYthing into that partial phrase he left hanging. Please don't set yourself up for disappointment this way. Couldn't he just as easily have been about to say something about filing, for instance? I'm not saying that was it at all, just pointing out that you have NO idea and NO way whatsoever to know what he was possibly going to say -- plus remember if he's in MLC mode he may not have meant what he was going to say anyway, or even if he meant it that day, he might not the next. My point is, this kind of analysis is a waste of time. And if you let your expectations get out of hand they can be your worst enemy.
ITA you need to give the guy some space. Maybe part of that is giving yourself a break so you can be more relaxed around him. Don't worry so much about your hair and outfit on days you expect him. If you focus on being the best once you can be and looking your best FOR YOU every day, you'll be ready when you need to be, right?
