Diet sounds fairly decent enough. Listen to what wukkadb said except be VERY careful on what type of protein shake you get.
I'm a BIG believer in plant based proteins when it comes to supplements. They are MUCH kinder on the digestive system and heart than stuff like whey and other dairy like protein shakes.
Stick to Barley grass and hemp protein. Spirulina is pretty good too. Avoid dairy supplements at all costs. Hell avoid dairy as much as you can, I say. Even if you aren't allergic, it WILL benefit you greatly.