You are spot on with your analysis of what was wrong and right, my problem is more with the characters. However, I can tolerate weak "villains" as long as there are interesting and well thought out characters and some cool twist in plot. However, season 3 seemed to flip the problems.