Jump on 805 or wait?

[Uniquely]

I'm REALLY wrestling with myself here. I found an Onkyo 805 refurb for $599. I've been wanting to upgrade my receiver for months now. I've just been feeling like right now the Onkyo 606 is the weakest link in my audio system. The 805 has so many fans and I believe it's a really solid receiver for $599. The thing that holds me back from jumping is that it's missing a few features I'd like to have. It only has 3 HDMI inputs... so when I upgrade my PC to one with HDMI out.... I'd have to get a switcher... doable but less than elegant IMO. Also I'd REALLY like a receiver that has the ability to output audio and video over 2 HDMI's at the same time. Sadly.... I feel it will be at least two years before a receiver like that hits at a price I feel comfortable paying.

Have any of you guys upgraded from a 606, or other lower line Onkyo, to the 805? If so... how would you describe the change?