If you switch to Surge PreW instead of the Whey and Oats then take 10grams BCAA's prior, during, and then your post-workout meal. This is of course more of a budget-minded approach, not necessarily the best.
HP Mass was a fine system. It ended up just being too much Pressing frequencing for me and I developed a lot of join pain in my one shoulder. In retrospect I would've deloaded more often, perhaps after every 2nd cycle to give my body a rest and maybe I could've stuck to it. But the amount of time those workouts take was starting to get to me as well. I've been doing 5/3/1 for the last six months and I won't be switching anytime soon.