Ever thought about putting your food into Fitday? While I had known about the program for a while I never gave it a good honest chance. Once you get your custom foods in it gets a lot easier.
A word on gaining while leaning down, try not to put the cart before the horse. What is your priority? Often trying to do those 2 goals at the same time you will do more of one than the other. If you want to lean down, then devote yourself to leaning down for period time of X.
"Fat loss is an all-out war. Give it 28 days — only 28 days. Attack it with all you have. It's not a lifestyle choice; it's a battle. Lose fat and then get back into moderation. There's another one for you: moderation. Revelation says it best: 'You are lukewarm and I shall spit you out.' Moderation is for sissies."
— Dan John, legend
Then after you loss the "fluff" you can concentrate on a lean gain plan. I much much much prefer a lean gain plan over the massive bulking/massive shredding mentality. I've done both, and with the lean gain your numbers don't jump as high but you are also keeping your bodyfat low while doing it.
A good article from a guy who once was a competetive O-lifter turned bodybuilder.