Enjoy your time out tomorrow! Don't tell him where you're going. Remember what ROOT said, be mysterious. Look great and be happy. If you're noticing small changes, I think you're right, what you're doing may be working.
It sounds like you're avoiding his R talks. While I don't blame you, perhaps it's your chance to tell him what you need for R? You're having a tough time because you don't trust him at all. So that's one thing you need, you need to start rebuilding trust. If he's serious about coming back, then he needs to end it with OW and be transparent! Have you thought about counseling?
Don't let his bad moods get to you. Perhaps he is looking for a pity party. The happier you are, the more attractive you are. If he says he's tired or has a headache, express sympathy. Ask him if he would like to go, and come back at a time when he's feeling better. He could leave, but maybe he'll perk up if you don't let him be a martyr.
If you're worried about him picking weekends that the OW works, see if you can do a switch-a-roo on him. Come up with plans that make him switch weekends. See how he reacts.
