Homeland season 6 despite some fine moments is losing its mojo

Getting set to watch season 7 of Homeland (maybe) caught up by watching all of season 6 and was not inspired.  S6 is filmed mostly in NYC or in an imagined NYC when no one's caught in traffic and parking spaceship are always available when you need one.  Guessing that star Claire Danes may have requested a season in NYC to be w family? Anyway in part by moving the setting the series seems to lose its mojo in S6 - it only remotely feels like a CIA dram, which truly was its raison d'rtre. The first three seasons were entirely focused on the terrific Brodie story - hero or turncoat and if the later why? And is Danes/carrie Mathison deranged or a genius in suspecting the worst? Since Brodie's death the series has foundered, entangled in multiple plot strands and this is especially true in S: defense of a young man accused of terrorism, a bo,bing in manhattan, a black, ops team in a house in queens, the mental and physical decay of agent Quinn, a rush limbaugh -like character, and dar (f Murray Abraham) plotting for greater control of the CIA (btw if he's not the director what is he?). Central to it all as if these weren't enough plot lines (and I have left some out) is a pres elect Keane - Iranian ambassador in s4 - putting together her leadership team and getting counsel from Carrie. It appears the creators guessed wrong in having a female prez elect w a foreign policy background and a crisp demeanor - but they were adept enough to pivot mid season into a pres as female trump avatar replete w paranoia, fake news (in this case the news truly is fake) and  protestors chanting not my president. By the last two episodes w an assassination plot in the works that for some reason I still can't figure out involved a us senator I was really lost - and uninterested.  All this said the season does have some moments of tension and Danes remains the most expressive actor on tv - it's as if she could conduct an entire dialog via facial expressions alone.