Amen brother! Go with the 820. End of story. Trek is an awesome company to work with. I have worked at a Trek dealer for a little over a year now and have yet to see a warranty claim denied. They are such a large company that replacing a frame, or a wheel or what have you, is essentially nothing to them. But it will buy them a customer in the long run.

Now, don't get me wrong, don't think that Trek is just all about $$ and what not. If you buy the Trek, you are guaranteed a good bike at the price range, and a company behind the bike that supports it.