I'm kind of in the same boat as you, although I'm looking one step up "the food chain". See this thread: Upgrading from an old Yamaha RX-V800RDS, RX-V673 a good choice or look at RX-A1020?
Please share your thoughts if you get to do a demo, I haven't had the ability to do one yet (no good...