Sounds like you are on the same track. You know something I dont think I mentioned.
My wife and I made a solid promise that if over this time period we get back together that we will stay until the kids move out. No matter what. It really helped me relax. Infact I told my wife that it makes it easier to concentrate on what I need to do for the marriage instead of worrying about the past breakups and the future. Just thinking about the here and now.