Season 6 Episode 3: I think I am done

I am really not a "hater" or ... whatever you can call it, but I am now stopping West Wing. I do not think I am going to finish it.

The first 3-4ish seasons were so charming, endearing and full of details, I "fell in love". The poker nights, anybody? And the know-it-all talks with the president? So awesome. I wanted to hug these guys through the screen. Now it is some sort of ... I actually do not know what to call it exactly, but the actual plots seem to circle around drama more and more. I fell out of love.

It got a bit ridculous with the new National Intelligence Director (played by Mary McCormack) started to hang around the usual gang. Technically, it is still about the West Wing in the White House, yet ... with John Spencer being gone soon, I do not want it to change "my memory" of the original group of main characters.

Am I wrong? What do you think of the last 2 season, do they get back to being "great"?