Glad you made the switch back to the plant-based lifestyle!
Not sure I have a good answer for you. A variety of plants, fruits, grains, nuts, beans should be covering all your bases. Quinoa for example has complete amino profile. I think you mostly need to deprogram your thinking about all macros, all the time and trust in the foods. A caloric sufficient diet from a variety of sources should more than cover your nutritional needs. Though do some reading and if you hit a plateau or start to regress in your training (strength, size, weight, etc.) then some tweaks are needed. The magic of the whole foods is that the sum is greater than the parts. Let the nutrients work together, not in isolation.
in general, we're inundated with marketing and mis-information. Walk the grocery store and notice the latest push for PROTEIN in pretty much every food -- you'd think we had a protein deficiency epidemic in the USA. More like most of us are overloading on it. Guess where the extra protein goes if we get too much and don't filter/pee it out -- body STORES it.
Great post that summarises most of what I would have replied with
I think you can sometimes end up over-thinking things, I know I have been guilty of that in the past. Main priorities would be a consistent high quality, varied and colourful diet with plenty of raw and organic wholefoods. Protein/carbs/fat are all important in their own right but I tend to now be of the opinion that making sure we get a high protein intake isn't the be-all-and-end-all; in fact I dropped my protein shakes a while back and noticed no difference in terms of muscularity or recovery & adaptation from training.
All the best with everything MF.