I wouldn't worry about being too analytical with your diet at the moment. Google 'precision nutrition how to fix a broken diet'. I'm not implying that your diet is broken as I know nothing about it, but you will find some great stuff in an article that could lead you to the body that you're after without the hassle of calorie counting, macronutrient ratios etc.
Once you get on track with those simple guidelines and you start seeing the changes you're after you may find that you don't need any further tweaks to your nutrition plan.
In my experience you don't have to start worrying about the minutiae until you get to a low body fat percentage.