In my new game, he still acts as though I flirted with him at the tiefling party, which I purposely did not. I told him to take his own advice and relax. After the party, my character still has the "I'm sorry if I came off too forward" dialogue option, so obviously this hasn't been completely fixed.
