I would also recommend a leangains type approach. Customize it to your level. This really works well to maintain your muscle mass and cut fat if done properly. Some of the leangains people get some crazy carb sources (like eating a gallon of ice cream or a box of cereal to meet their macros) but you do not have to eat processed junk to get your carbs. There is a calculator you can use with leangians to see what macros you should shoot for on workout days and off days but I see it more as a guideline, since I am not doing a ton of heavy weightlifting with crossfit.
Keep us posted on how you are doing!
Leangains. But you're gonna have to be strict with all your counting, both food and exercises.
OP should get rid of more of his bodyfat before trying to gain more muscle and consentrate on that, because you cannoth do both at the same time. Get down to 12 % bodyfat or so, stay there for around a month, and then start bulking by increasing calories and lifting heavy ass weights...