I wouldn't go with either, at least for the time being. Even if option B was the perfect person for you, it could all fall apart under the strain of a divorce and lingering issues from your ex.
If it was me, I'd give DH a chance to prove he's making real changes by allowing him a good 6 months or so to show you he's serious about making it work. If you go with the other guy straight away you'll never know if your DH could do it and if your marriage has a future.
The situation with option B seems a bit too full on, while its nice to hear these things now it'll wear thin pretty quickly if there's no substance behind it.