You can find a pointing Lab that does both upland game and waterfowl. I'm not sure if it is something that is in the genes (i.e. you can find a breeder that has pointing labs) or if it's by chance that you happen upon one.

Also, you can work with a lab or even chessie (non-pointing) long enough that they almost simulate a point. I know of a chessie near me that the owner spent so much time training the dog not to flush that it essentially points now.

I would also spend some time looking at the versatile breeds. porknbeans mentions griffons and dd's. definately good options.

I went through the exact process you are going through about 4 months ago with the only exception being I was also looking for a dog that could track a wounded big game animal. I opted to go with a dd. Can't tell you first hand how good he will be in either upland game or waterfowl hunting, but I have heard nothing but fantastic feedback on both fronts. Plus my son saw a picture and said "that's the doggie I want"... pretty tough to argue that. He will be born the first week of jan.

Good luck in your search. There is an abundance of information around and a ton of people that know a lot (especially on this board).