Diet looks, good to me, maybe more carbs, but if you feel good, i think your fine. But I'm not a professional.
I've read that if your protein contains some fat, like chicken or beef, they recommend the 1.5g per block...since that allots for the fat in the meat. If you eat egg whites for your protein for example, it's a non fatty protein, so you should add 3g of fat per block.
Hope that helps.