There are better choices for your source of protein and carbs. I would get more meals in there with a different variety of protein and carbs. As mentioned, go with the Avocado's, Nuts, Omega 3's etc for better fat. 

Tilapia is a great source of protein among other fish aside from Tuna in a can. 

This diet could improve greatly! Check the forums for so,e good info man.

What time of the day is your workout? You want to center the kind of carbs your rice is giving you around workout times. And Im guessing you are only running a mild calorie surplus based off what you have listed here. You are similar size/proportion to me, and when I bulk, Im running 6500-7000 cals a day, with my maintenance being right around 4400.

Ask yourself, can you drink that coffee black? Could you swap out some of that rice for some whole grain oats mixed with a weight gainer protein?

Mayo can make tuna and egg salad easier to eat, but its not really the kind of fat source you want. Almonds and unsalted cashews are your friends.

Your post workout should involve either a sugar supplement (powder dextrose is easy) mixed into your protein shake, or simple sugars that come from fruit, sports drinks. This is also the time for creatine/glutamine as the simple sugars help transport nutrients into your muscles, not to mention stimulate insulin release.

I keep it simple when Im at work: the night before, ill scramble 15-20 eggs, pack a tub of peanut butter, a container of unsweetened greek yogurt and mix some lean protein into it (strawberry :-D ). I eat 4 eggs, 6-8 tbsp peanut butter, and 6-8oz of greek yogurt with protein every 3hrs. Cheap, simple, and keeps my macros where I want them, high fat, high protein, lower carb, then ill dump 120grams of oats about 1.5 hrs prior to workout to give me fuel that wont turn into fat.

I don't want to get long winded. This could use a alott of clean-up. I'll try to stick to what I think you are asking about though.

For fats you could substitute: Avocado, Almond butter, and nuts(almonds, peanuts, brazil nuts, cashews, and pistachios) in addition to the olive oil and peanut butter you already have. Personally I would ditch the mayo.

For carbs: oats, ezekiel bread(if you can find the real thing), sweet potato, brown rice, blue or purple potato, quinoa, kidney or black beans, also whole wheat tortillas could work. I would stay away from whole wheat bread and granola, because it's processed and you don't really know what's in there. Could say the same for tortillas, but I list them anyway.

For protein: chicken breast, turkey breast, 97/3 ground turkey, salmon, trout during the day. Red meat like bison, beef(low fat cuts like london broil, flank steak or strip steak) or venison at night. Tuna, unless it's fresh not canned, is a poor choice in my opinion, because it's biological value is low.

Another thing I see is you really don't specify a post workout meal. Try to get at least 50 grams of fast acting carbs(white rice, dextrose,pasta) with 30-40 grams of protein that has a biological value of 100 post workout. (a shake with a bagel is perfect for this.) One other thing that glares at me is the meal separation. If it were me I'd be looking to get more meals but keep my daily macros the same. This looks like 5 meals, I would try to get it to 6-7.