CD, sorry you didn't get any responses earlier. Personally, I've been dealing with a migraine all afternoon. Blech. I know PDT is sick... It sounds like you've handled everything just fine though!
I've been having some of the same thoughts about H that you are having about W. Maybe it's a tad easier for me because I only suspect EA and there's no proof on infidelity at this juncture - to consider full reconciliation. I just can't shake the feeling that a man couldn't do this to his wife of almost 20 years without another woman involved somehow... Can you take her back all things considered? Remember just as W's emotions are fickle, yours are too. I think all LBS's go through this feeling once they've done the work to get themslves healthy and GAL of their own! Thankfully, you don't have to make this decision right now. But to know you have a choice rather than just being driven by fear of losing the M is a good thing.
Looking at your steps above, I feel you are right on target with your plans!