Naomi should NOT have gotten saddled with that bitchass. Let's review:
1. He LEFT her before the series started cause he said he just didn't feel it any more. That's why he ended their marriage.
2. They briefly reconcile, and he HE gets pissy cause she's not rushing to commit
3. He screws her best friend. And then, the best friend is more upset about it than HE is.
UGGGGGGGGGGGGGGGGGGGGH.
Too much damage was done to Naomi and Naomi/Sam in the name of the big scary Sam/Addison love. So yeah, that is crap.
What else happened (if you don't mind, LOL)?