My two cents worth: mostly backing up gucci and puppy. Look how far he has come and how he has gotten there. Don't forget what works. Then look at what he is saying, like guccil -I agree that he should be confronted on the OW and lying in the present. Push for the truth now, he will either be honest or not.
It sort of reminds me of the talk with my H last week. He wants to begin reconciling, while all the time talking about what he needs and when I confronted him on the question of how ready is he to be my friend - be there for ME - he is still talking about himself. Another big problem with us is his constant quitting behavior - and all he is talking about to me is how after7 months of RCIA classes - one wrong word from the priest and he has quit the church, then I discover his sponsor was a temp and now he has another temp.-he was committed to certain meetings and now goes to different ones because they weren't doing anything for him. You have to listen to the words and match it with the behavior carefully. Let him know and see what he says.
Tough place, tough call, most important part is - what do you want and how do you feel about him?