That's definitely a good healthy diet to adopt for the long-term. A logical next step would be to shift the majority of your carbohydrate intake into the "window" (anywhere from 1 hour before training to one hour afterward). By going low-carb for most of the day, you help restore insulin sensitivity to the muscle cells, and give them the fuel they need when they need it. At any other time, you're most likely just feeding your fat stores.
Another thing I've been studying on recently is fructose. Long story short; keep it well under 100g/day. The only organ that can use it is the liver, and ALL excess goes to fat; mostly visceral (heart attack fat) and love handles. Dextrose and dextrins (chains of dextrose) are what you want. Dextrose can be used by all tissues of the body. So as a quick guide:
table sugar is 50% fructose
HFCS is 55% fructose (sodas, bottled gatorade, etc.)
Sugar in fruits is ~50% fructose (a medium sized apple contains about 10g)
Use these sparingly. Very sparingly. I try to keep my fructose intake to <25g/day
All starches are dextrins. There is no fructose in any starch. Powdered gatorade uses dextrose as a sweetener. Potatoes, pastas, oats, and anything else starchy is fair game. Muscle fuel. I use pure dextrose in my peri-workout drink and it works wonders.
Just remember to consume the majority pretty close to your workouts to put it to the best use.