I'd take a look at Ascend Acoustics speakers, whichever fits your size and budget constraints the best, and pretty much whoever you like for a sub and do 2.1.
I can't imagine anyone not liking any of their offerings, and I've heard all of them except for the CBM-170 (and own their smallest speakers for my PC, the HTM-200SE). The HTM is a GREAT small speaker, which was important for me doing 5.1 in a computer room, but if I was doing 2.1 I prob would have gone with the CMT-340.
I went with a VTF-1 (10") for my sub but only because it was on sale, otherwise I would have gone with a STF-2. Any of their (Hsu's) subs are good, but so are subs from SVS and Epik and eD and Rythmik and others.