Battlestar Galactica too self-indulgent in season two?

Overall I think that in season two Battlestar Galactica has been guilty of being self indulgent. Most of the two part episodes could have been edited down (in the writing process) to awesome single episodes. But with the guarantee of a third season they're spinning it out a bit. For example, Downloaded and Final Cut, fantastic, focused single episodes. More of that please. Less of the two parters. More fear of being cancelled.