Joe, the guy I used to live with, swears by chocolate milk after and I do that as well (when its stocked at home). Good call. With the BCAA's Ive read that you get 25% of your BCAA's from whey protein shakes so I dont feel the necessity to supp those in just yet. Do you know my huge buddy at the gym? He recommends the following and I've seen this posted online as well from other users:

25g Whey protein 15min after waking up + 5g BCAA
20g Whey protein 45min pre-workout + 5g BCAA
40g Whey protein 15min post-workout +40g waxy maize carbs
30g Casein protein 15min before bed + 5g BCAA