Sorry for the late reply...
It's a slow build of trust and intimacy for both of them. I think it's kind of a two steps forward, one step back situation.
And yes, Sherlock's issues with Moriarty are definitely not over.
Thank you for the thoughtful comment. :)