I went with option 2 and exchanged the chicken for egg whites and the avocado for peanut butter. I put the peanut butter on my rice cakes that I eat for my post workout meal.
Whenever I have tried macros on my own I always had a hard time figuring the correct percentages as well. I am a longtime Weight Watcher and end up falling back to tracking that way.