cool!
another option is to continue with the cross fit and add in some strength specific work at the end of your cross fit workout. you could also do a simple morning routine of push-ups and pistol squats for maybe 12-15 minutes and within a few weeks you'll see noticeable improvement.
Think I will try some Wendler 5 3 1 fit in around the crossfit workout. From taking a quick look, it seems like it uses the same basic lifts I have learned through crossfit (good, and same philosophy of big major complex movements), matches up well to the frequency of my crossfit workouts, and is well structured so I can easily follow the plan (not being a natural gym rat, this is helpful) and looks like it will be self-fulfilling with frequent PRs.
What's your pushup / pistol routine? Do both till can't do no more?