I'd highly recommend the ME-Black Box work that Coach Rutherford has produced. If you follow it you will allow for adequate recovery for training, push your 1RM efforts up and this will drive your WOD's further. I think his son took 3rd in state using this system and a wicked double leg take-down.
Keep us posted on how you proceed!
"Survival will be neither to the strongest of the species, nor to the most intelligent, but to those most adaptable to change."