Am I the only one that noticed there's a leak in the CBI?

On two separate occasions in episode 6x7, that Sac PD guy mentioned that his "informant/source inside CBI" provided details asto 1) Rigsby and van Pelt en route to the doctor's office where Smith was being held, and 2) that CBI officers were en route to pick up Smith in the alley. We know the leak isn't Bertram, since he told Bertram about Smith in the alley, so it's gotta be someone we don't expect. I'm guessing that his informant is the guy/gal who's been feeding information to Red John since the beginning. It doesn't have to be a Blake Association member, but Lisbon, van Pelt, and CBI Ron come to mind.

We learned from Smith last night that the Blake Association helps you when you need it most, and a payback of services is offered in return. I recall a couple weeks back the Sac PD guy brought the Kirkland forensics report to Rigsby, and before he left said, "Hey, maybe someday you can do something for me." I'm not pointing any fingers at Rigsby cause I think he's clean, but that sure sounds like the offerings of the Blake Association to me. I don't know why I didn't pick up on it earlier. Such a subtle hint. I wonder how many other people inside CBI have been coerced in the same manner...

I saw the promo and my money is still on Haffner. As many have pointed out, CBS is not going to show the actual Red John in any portion of any promo. Like Jane has said before, we (as viewers) are missing something. Did Jane shoot McAllister and that's why he has the wound in the promo? Is Bertram actually Red John's right hand man? Is Michael Kirkland actually Red John, who turned to Visualize for support and became a different person?

All I ask for is an explaination and a good twist that makes sense and ties up the loose ends. Too many unanswered questions right now.