hmmm are you sure that you are 18% bf? how did you have this measured?
if so, then I might suggest to cut before you aim to bulk first..
Otherwise this looks like a great diet for adding lean mass.
a few suggestions however..in your post workout meal remove the olive oil.. no fats there. Also the only sources of EFA's that Im seeing are from olive oil and natural peanut butter. while these are good choices Id reccomend getting in some flaxseed oil, fattyfish(or fishoil caps) or perhaps Udo's oil. aside from that.. looks good!
