I like ur eating schedule, but as a hard gainer my self I know sometime u have increase the carbs even more. Go heaver with ur morning shake add yogurt, a few eggs if u have the time. Yams kick ass , include them in lunch and break fast.
Go to like 3500 Cal a day. Don't worry about fat to much u can thin out later as long as u keep working out.
Just what I would do. Good luck g