TweetToo much proetin, 400g is plenty, i would lower carbs to and add more fat. I use your approach when bulking, I cut out carbs in my last two meals, and my pre-bed shake only has carbs from the skim milk and natty PB.
How about
400g protein
400g carbs
200g fat, yep 200g, mostly from good sources, avocados, olive oil, flax, peanuts, cashews, nut butters etc.