If you decide to go with a unified system, consider the following approach.
Sell:
I've owned many passive speakers, and I would not go back to them. With your budget, you can get a killer system.
Sell:
- Riga Mira amp
- Cambridge 640C CD player
- whatever DVD/Blu-ray player you have
- Musical Fidelity DAC
- Infinity Beta 40 speakers
- Squeezebox
- TV
- Oppo BDP-105D ($1300)
- A pair of active speakers (the majority of your budget)
I've owned many passive speakers, and I would not go back to them. With your budget, you can get a killer system.