Yuck! I personally would not reccomend a yamaha guitar. Admittedly, I haven't played any recent models, but I do know that the ones that i've played sounded dead to me.
The right acoustic guitar depends largely on your price range. Taylor makes some beautiful acoustics, but if you want a guitar with Indian Rosewood back and sides, with a sitka spruce top (this is my model of choice), then you are looking at a cost of well over 2,000 American dollars. I absolutely LOVE older Martin acoustic guitars. I know someone with a 1976 Martin D-35 and i've never played a nicer acoustic. It is fantastic. Supposedly Martin's build quality has declined a bit from those days, but I wouldn't believe that unless I tried some of their newer guitars.
I would personally try out Taylors and Martins. They are my guitars of preference. What back and sides you want will also largely define your tone and the responsiveness you get from the guitar. I prefer a Spruce top with Rosewood back and sides. You may notice that most high-end guitars are made with these type woods, and it's for a reason! These are typical "flatpicking" tonewoods and if you find the right guitar made out of these materials, you will be in heaven. The bass is booming and the trebles are very clear. You may see very expensive guitars made out of woods like Koa and Walnut, but they are largely priced that high due to the rarity of the wood and the difficulty in manufacturing guitars made out of those woods. Their price is not as largely dependant on the tone of the guitar. Also, if you look at the majority of famous artists, most of them have Spruce-topped guitars with Rosewood back and sides.
That guitarist you provided a link to seems to be playing a mahogany guitar. This is a popular finger-picking guitar wood. It's tone is not are sharp as spruce, and it has more mellow tendencies. I have a guitar with mahogany back and sides, and it is nice. You will find that Mahogany acoustics are cheaper as well.
One thing I can't stress enough for your acoustic is to put a 15 dollar pack of elixir strings on it! I am in love with these strings. They will make playing feel like butter! You'll notice a tremendous difference when you put these one, they help a lot!
Anyhow, as you may be able to tell, I love acoustics. If you have any quesitons, ask me, and I will try to help. Visit these sites in the meantime.
www.taylorguitars.com (Stunning acoustic guitars, especially the 800 and 900 series.
http://www.mguitar.com (The grandfather company of fantastic acoustic guitars. A lot of tradition in this company.