My opinion lately is to go middle of the road, and look for two things:
1) a decent digital processor, and
2) pre-outs for all the surround channels.
This gives you a clear upgrade path to add outboard power when you feel like you want more juice to drive your existing/future speakers.
Generally speaking, between two models, like the AVR3805 and the AVR2805, the power differences hardly justify the price. Especially when you consider that processing changes every 2-3 years or sooner, it's easier to swallow upgrading your integrated every couple of years, rather than forking out $2K+ for a new straight processor. Amplification after all doesn't exactly become obsolete...
I agree with Tony.....Outlaw had a very nice 6.1 receiver that I found noticeably better than a comparable Denon I upgraded from.....and they are just about to release their new model. I'm not sure on the time frame, but you may want to keep an eye out.....Outlaw is a strong option.