Avr or preamp?

Since adding the TiVo I have run out of hdmi inputs on the tv. I use a pioneer sc-35 that the hdmi board is dead. So the receiver is used for audio switching and the harmony remote takes care of all the tv settings. We only use the sc-35 as a preamp to power a 2.1setup with a b&k 5 channel amp. I like the sound of the pioneer with the polk703 speakers. We use the zone2 output but always listen to the same source thoughout the house. So do I need a zone2 capable avr or can I use a tape out and do the same thing. I use an adcom speaker switch with impedance matching volume controls at each zone2 speakers. I would like to up the sq if possible and switch 4 hdmi inputs and maintain the whole house capability. An ideas besides an avr with preouts and zone2?
Main system: Lyngdorf TDAI 2170 w/ Pioneer 42" plazma-> Polk LSiM 703 w/Tivo, Marantz tuner, BRPTT: Nothingham Spacedeck-> Pioneer PL L1000 linear arm-> Soundsmith DL 103R-> SUT->Bottlehead ErosDigital: I3 PC w/ Jriver playing flac -> Sonore Ultrarendu -> Twisted Pair Audio ESS 9028 w/ Mercury IVY Vinyl rips: ESI Juli@24/192-> i3 PC server