I hear ya on the too chocolatey (and I LOVE chocolate). If available, I opt for a black and white shake instead of vanilla or chocolate.