Actually, this is one of the better plot ideas that has come up on this discussion board--get more of O'Neilll (with 2 l's) into the action. And let his character actually get more expressive, like in the good old days....
Like what if Rush and O'Neill switched w/the stones while he was channeling MacGiver? I think that could work.