I still say Lean Mass matrix by ProLAb is the be all-end of all of MRP's best ratio of macros, and great taste when blended with water and ice. You could add a scoop pf protein powder to jack the protein from 40 grams to around 60 or so. And BlackDog, you mentioned getting the right type of carbs, well the maltodextrin in Gainers Fuel has like a 100 rating on the GI index. NOT GOOD!
I'm sure he meant complex carbs, so just eat them with more frequency but fewer total carbs/day. You should be able to get at least 2000+ very clean carbs from just shakes.