bro, you need to cut back on the amount of shakes you use. I would try to get most of your protein from real food and save the whey for the morning and post workout. Other than that you seem to be going in the right direction. I would also add fibourous veggies to the majority of your meals. Sorry to hear about your friend and good luck.

-SHRED