I think what made that so annoying at the time was that by that point we knew the show was coming to an end but the story was moving at a snail's pace. There was less and less time to cover an enormous amount of content and it felt like Naomi's arc was taking way too much time.

Re-watching it later was more enjoyable.