Here is a curve ball for you. You probably don't need to have the same PWO shake every workout. On very high intensity days, I will add about 60-70g of WMS to my PWO shake. On light days or pressing days, it's normally 30-40g. I basically put back in what I'm taking out...a harder workout will deplete my body more than a light day, so why have the same shake both days? I don't know if this makes any difference to you, but I thought it might interest you if you hadn't already considered it. What you're doing now is "safe" and I don't know if there's a reason to adjust anything, but if you ever want a lighter shake after a lighter workout, then go for it.
Looks like you're doing well with the diet. Keep up the good work.