For rock climbing I need some more specific finger strength, as well as skill reinforcement and development. For bigger days I need to also develop a deeper base; big days get easier with big-day training for sure.
With all of the above in mind my base plan is to follow the CF WOD, but add in a few sessions a week of either cragging or bouldering in the gym (dropping the CF intensity on those days or skipping it or rolling a couple of workouts together at a reduced level). I don't need to make this too specific yet; just moving and loading my forearms will be enough. Going climbing also involves walking to the crag here, so that will help with the long-day prep.
I also need to work my range of motion regularly; I have a yoga routine I often do before the CF WOD or climbing that really, really helps me move better. I've been doing that twice a week, it should be more like four times a week. I can tell when I'm not stretching and working my ROM enough, I get all creaky...
So that's what I'm doing for the next month or so... I'll start dropping CF workouts as the flying/paddling/climbing takes over the time slot.
Nutrition Thoughts: Form does follow function...
One "odd" thing about Crossfit is that, although the workouts burn a lot of energy per minute, they don't burn all that much energy in total. Even including an extensive warmup the total calories used during the exercise are relatively low, especially if you are used to the calories burned in aerobic sports (mountain biking, ski touring, etc). Many Crossfitters are relatively sedentary outside of the WOD. If you look at the physique of most Crossfitters it's more classically mesomorphic; some are very lean, but seldom in the same way that top aerobic athletes are lean. I don't think being super-lean is much if any of an advantage for Crossfit; being leaner will help with pull-ups and other gymnastic stuff to a certain extent, but the return on effort expended to get leaner below, say, 10 or maybe 15 percent BF for guys, is likely pretty darn minimal. Yet I hear a lot of, "I want to be ripped!" in the CF world. Getting really ripped without burning a ton of calories with exercise is pretty hard to do; hence all the nutrition freak-outs in the CF forums, the "I ate a piece of pizza, I'm doomed!" comments. No, you're not doomed, it likely doesn't make any difference at all. But if you're neurotic then you're by definition not thinking straight, and you'll think it is a problem... So CF athletes want to be super lean like high-aerobic burn athletes, but don't do the exercise loads that tend to naturally result in a very lean physique, and as a result are often in a mental conflict. I'd say let form follow function, spend less energy worrying about body fat levels and more on good form and intensity (which is really hard to get if you're not eating enough carbs...).
Something to think about anyhow. I always find it amazing how my body changes to fit the function I expect of it. If I just do CF I noticeably gain muscle (not saying much, ha ha!) and a little fat if I'm coming off a climbing season where I'm really lean, or lose a little fat if I'm coming out of kayaking where I tend to get a bit fatter. But form does follow function despite the massive efforts of people to fight this basic natural concept. Cheetahs aren't fat, antelope aren't fat, healthy seals are... People who sit on their asses and eat continually get fat. Go run 20K a day and you will get skinny... We are all animals.