With regards to tracking I don't believe that you need to be very strict when you're looking to maintain or gain. Personally how I set things up is by using a small erasable whiteboard. I will just jot down what I ate and then total up the F/C/P and cals, then I'll know where my totals are throughout the day just by counting the calories and the F/C/P.
I know you like to be very regimented with everything so that's just an idea of how to make it not seem like a job or chore, but by all means keep doing what you've been doing-- you've been a great job with your plan thus far.
Another suggestion could be to list different categories such as Protein and Fats, Protein and Carbs, Shakes, and others (this is what I'm starting now). I'm just putting a check mark next to the category when I eat a meal that fits that specific category. Each meal should meet a certain range of macro's and calories, so I should have about 4-5 whole food meals, with 1-2 shakes. That's just another example.
I do things for the sake of simplicity. But again do what you feel is best for you.