The problem of bringing in O'Keefe for Henriques is the same problem with bringing Henriques in in the first place - not enough batting. I rate O'Keefe immensely but I don't think he's a top 6 batsman. (Would love to be proven wrong!)
The three C's (Clark, Copeland and Cameron) plus Haurie are automatic selections and with Smith in the side we already have two spinners. Rohrer hasn't had the best start to the year, but I still think he's our best No.6 and should come back in. Still it's an intriguing idea to bat O'Keefe at 6 (or 7 with Nevill moving up).
Just hope the rain pisses off in time to prepare a good deck for the SA game next week.