The macros you posted in the sample diet are accurate in terms of being 3600 calories. The macros you posted above would equal around 4500 on workout days and just over 3600 on non-workout days. If you are trying to lean down and want to stay in the 3,600 calorie range on workout days I would increase the protein to around 400 and cut the carbs by 68g to replace those extra 272 calories. If 280 carbs seems too low for you could also cut a little of the fat, just remember protein/carbs = 4 calories per gram while fat = 9 calories per gram. Also I would try increasing your breakfast carbs and raising your pre/post-workout carbs and lower the carbs of your other meals throughout the day as opposed to having such a small carb intake pre/post-workout.