Actually many will recommend to buy audio components over time and peice together the best your money can buy. Yamaha is good but I still think the absolute best bang for your dollar is Onkyo.
2.1 is a great place to start. However, How much are you looking to spend? A good subwoofer if you are looking to just buy one will cost you around $500 for a decent sub, so you may possibly want to look at maybe getting a pair of tower speakers instead to save money if you can get a good deal.
Also, there is nothing wrong in looking at some older used speakers. Many still prefer speakers that are from the 70s such as JBL 43xx models and some older Tannoys. In many cases it is cheaper to buy used and replace the cone surrounds and do a little repair work than to buy new.
So for me to really start looking around and helping you, what is your budget, and what size of speakers are you really wanting to look at?