Good post man.
Am I now wasting 16-20g's?
No, the only way protein is wasted I believe is if you're eating more through the entire day than your body needs. Protein content per sitting shouldn't matter as much as your daily figure.