I was going to comment earlier on your day. Two things stand out in my mind:
1)He came home to go to church with you (A definite plus)
2)He invited you to come to the workplace. Could be a way of showing OW that he's trying to make his M work and she should step back. I'm not really sure about that; but if she's at all like you say she is, it's possible that she's borderline stalking him and would know if he was at work. So this could be a plus as well. Give it time for the pics to come back. Baby steps remember.
I think there is some definite positives at work here.