Firstly, welcome to Steroidology.
I would agree with beaf in terms of leaning out first.
What are you're goals?
The 50/35/15, P,C, F split is a good one. You may also find that 40% protein, 40% carbs and 20% fat works well for you as well.
I would definitely incorporate a whey protein into your diet. You will also want to supplement your diet with some EFA's. The easier source in my opinion is Flax Oil or Udo's Oil. One tablespoon is equal to 15g of good fat.
You might also think of giving some sort of a fat burner a shot to give you an extra little kick. I myself, prefer the ephedra/ma huang based burners or the straight ephedrine, caffeine, aspirin stack. Providing of course that you have no health concerns.
