This is a long shot, but: since Bishop is the main problem here, and we know that Kalinda (and not Diane) won't be a main character in the (possible?) seventh and last season, I'm guessing it'll be the other way around…Kalinda kills Bishop, solves Diane and Cary's problems, then is killed or disappears.