It sounds like you are on the right track already. I eat similar percentages and I have lost fat while gaining muscle.
Just eat until you feel you have eaten enough. Don't 'carb up' or go out of your way to stuff food in. If your body needs a bit more energy, you will just feel like eating more..
The "Seven Deadly Sins"
ē Grains (wheat/rice/oats etc) . . . . . ē Dairy (milk/yogurt/butter/cheese etc) . . . . .ē Nightshades (peppers/tomato/eggplant etc)
ē Tubers (potato/arrowroot etc) . . . ē Modernly palatable (cashews/olives etc) . . . ē Refined foods (salt/sugars etc )
ē Legumes (soy/beans/peas etc)