To be honest I think your diet is quite solid and you certainly seem to have the right idea. I don't think you will see that great deal of difference between the 2 differences but I would go for the second option of spreading carbs out throughout the day apart from your last meal.

the diet sounds pretty good, donīt worry too much. just one thing: get enough veggies min. 400g a day, and make sure you get omega3, for exymple in salmon or take fish oil caps. itīd be good to consume 2-3g of epa/dha a day.