Yeah, so it's pretty clear now, isn't it? After watching the extended promo, I think this is how it's gonna be in 6x08:
1. McCallister joins Patrick in church, they have a nice talk, one of those "mentalist" conversations. (I wonder when did Patrick realize that McCallister survived the esplosion, because I'm sure he knew that Sheriff is Red John by the time he decided to go to church) ;)
2. Patrick shoots McCallister, but for some reason doesn't kill him. If I didn't see the promo, I would think that Patrick would spare him for some reason, or just let him live for some time, or maybe decided to give him to the police, but now I'm pretty sure that McCallister just manages to escape somehow..
3. The final man hunt begins. At one point, McCallister "visits" some house, enters it by breaking through glass door, as we see in promo. He bleeds, because of the events in church.
4. a) Later, both Patrick and McCallister are on the graveyard, McCallister is running from Jane. The question is: what were they doing on the graveyard? How did they get there?
b) Jane's team and the FBI are also on the scene somehow, not sure what role they play yet.
5. As we know, in the end Patrick strangles Red John. We didn't know how would he manage to do it, since pretty much every suspect was stronger than Jane. Now we know - McCallister is wounded very seriously and Patrick can probably overpower him easly.
And I guess that's how it goes I guess. Except... maybe McCallister is not Red John? I mean... Well, we all agree, that Bertram is not Red John, because it's too obvious. So because we are all here so very super smart, we found out, that McCallister must be Red John. Don't get me wrong, I'm almost sure, that the mysterious guy in the promo is McCallister... but maybe it's not Red John? Maybe that's just the final, ultimate red herring? The final trick? That would be something right? :) I would very much like that... Or maybe after 6 1/2 seasons I getting a little paranoid? ;) Well, we'll see.