early morning pre-workout nutrition

Because of a new daytime schedule I'm moving my weight training workouts to the early morning (5:30-6:30am) starting next week. In the past I've started my day with a good protein shake first thing, and after getting ready I'd eat a bowl of oatmeal with nuts (walnuts or almonds) and fruit (one of the following: banana, raisins, cranberries, apple, etc.). That's too weighty in the stomach and slow releasing for doing weight training 30 minutes later, though.

PRE-WORKOUT: I'm thinking I'll build a shake with whey protein, BCAAs, glutamine, and blend it with some fruit for quick energy. But I'd love to hear from others that workout early in the morning- what do you eat? I'm concerned about getting enough fuel. I hit the gym hard and fast, and I'm trying to gain a little more mass at this time, not just maintain.

I'm open to post-workout meal suggestions, too. Oatmeal is low GI, and after a workout a spike is more helpful, so i'm thinking protein shake, omelette, and pancakes / waffles / cereal. And save the oatmeal for an hour later.