Difficult question. I think choose your battles. The most important thing, in my opinion, is to do the Retrouvaille. It will be easier to accomplish all the other stuff after that.
My advice is: figure out what you really need between now and then. It's 6 weeks away. The one woman boundary is a good one. Retrouvaille wants it too. So go for that. If he wants to be with you there are no other women in his life. It should be no contact with OW. (But don't police it, you don't need extra arguments.) And lying. You want the truth out of him.
I would save the sexual stuff to work on at Retrouvaille, it's part of the program. Him making changes is also something that is addressed at Retrouvaille.
So that's my advice. Faithful and honest and the rest save til later. Good luck, it all sounds good!
