"Andrew Johns race scandal may cause team changes for Origin II"?

NO. Leave Gidley on the bench. I like the team exactly how it is, messing it up now would only cause more chaos and confusion, and plus, Hayne can't defend on the wing. I prefer the straight swap as this eliminates the confusion caused by moving everyone around.