With your emphasis on waterfowl abilities, a lab would be a good choice for a combo woodcock/grouse/waterfowl dog. A GSP or GWP could handle your needs as well. Probably a little better on upland ability than a lab, but not as good at handling cold-water work.

Throw in quail hunting and you have a problem. If you're talking wild quail-- a dog needs more run than a lab has in him.

Kinda like pickin a gun. I'd consider how I was going to use the dog most of time and make a decision based on that.

Good luck.