How much fat – protocol help

I’m having a hard time identifying how to properly measure the fat in my diet. In the process of adjusting my protocol, I realized that I sometimes count ounces, sometimes tablespoons and sometimes suggested “servings.” What SHOULD I be counting? I don’t really like weighing my salad dressing but you can’t really measure olives in tablespoons. And, of course, if the peanut butter jar suggests a serving size of 2 tablespoons, that’s what my brain says I should eat! 😉

Also, how much of whatever measuring method of fat SHOULD I be eating? My new current protocol includes: 20 oz veggies, 2 servings of protein, 4-6 oz of grain (3-4 times per week), 1 serving of fruit (4-5 times per week) and ?? fat, divided into 2 meals in a 6 hour eating window.

Thanks for your thoughts!