I know Comtech is a big believer in his method use in such cases, but honestly is it worth it? the problems you are experincing are typical, I know all advice you have been given is sound but with the best will in the world what should happen in theory often doesn't happen in practice, just format and clean install it'll save alot of grief in the long run.
Martin Replying helps further our knowledge, without comment leaves us wondering.