I am looking to upgrade my current HT system. I have a Marantz SR880 MKII and am looking at the HK line. I have narrowed it down to the AVR525, AVR7200 or ARV630. I have B&W speakers and sub. I want to run 5.1 in my HT room and 2 other speakers in another location. Will the AVR525 do the job or do I need the AVR7200? I am tempted to wait for the AVR630 because it looks like it is software upgradeable. The one thing I don't want to do is upgrade again in the next year or two. Any help would be appreciated.