I think what you laid out will work for you as long as your recovery is really, really dialed in. You also could go with the main CF WOD as was mentioned by Rob.
I was having a conversation about this last night. I do the CA WOD and train anywhere from 1 to 5 times a week in BJJ and MMA. Mostly BJJ with the gi. Lately I have been shying away from additional BJJ training because I don't want to be in an over trained state and my focus has been on O/Lift performance.
I am also probably under trained as a strength athlete. The conversation I was having was am I an O/Lifter who does BJJ or a BJJ player who O/Lifts? That really drives how you schedule your workouts.
My answer, in short I don't know what I am. I am more than likely going to compete masters age group blue belt in some tournaments starting in June or July. If that pans out the way it is looking I will have to change my training to something more like what Rob laid out in the PM article.
What we think, or what we know, or what we believe, is in the end, of little consequence. The only thing of consequence is what we do. -John Ruskin