What you need to understand is this: all progress is made by simply doing the things that make a difference day in and day out with mind-numbing consistency.
As an example: consider the thousands of people who have built a ton of muscle over the years, what two things do they ALL have in common?
1) they all added weight to the bar in a progressive manner over time
2) they all ate enough protein to repair muscle, and enough calories to fuel growth
That's it. Beyond that, there are a billion different things that they will tell you are the "keys" to their success.
But guess what? 95% of the time, what they think are the keys, don't fucking matter AT ALL (whether it be not eating carbs after 7:00PM, or seperating macronutrients, or keeping workouts to under 40 minutes, or whatever).
What they don't get, and what you apparently don't get either, is that if they just stuck to doing the things that actually make a difference, and stopped obsessing over all the other shit they think is so goddamn important, they would have made the exact same amount of progress, with much less worry/hassle.
So, in conclusion, if separating out your meals into P+C and P+F allows you to sleep better at night, fine do whatever you like. Just understand that even if you DIDN'T, your progress won't suffer as long as you keep on doing the things that matter (which is apparent that you have been.)