I was out the other day with a guy that hunts primarily upland game, and has a black lab. He's a very nice dog. Worked a close pattern in front of us, pointed the birds, then flushed, and retrieved to hand. Very very nice dog. One that would also do well with waterfowl as the lab is a born retriever.
However, if I had my choice and money wasn't too much of a consideration, I'd have a Pudel Pointer. The PP is very much at home with upland game or waterfowl. I don't have a PP, at present I have a German Shorthair, and he's awesome, but if I add a dog and money isn't tight, it will be a PP. I don't know if they are awidely known breed, but the research I've done on them left me impressed with them. This breeder:
http://www.cedarwoodgundogs.com/ really seems to know his stuff, and had good information about PP's.
A lab is also an excellent choice, and probably cheaper than a PP, but I'm a firm believer in waiting a little extra, paying a little more, and getting exactly what you want. Do a little homework and then you'll be glad with your final choice.
Best of luck.