Smith likes the Tannoys, the Tandberg & his Mc, so let's see what our collective wisdom can come up with keeping (most/all) of these items. I, for one, would opt for a used cdp -- the likes of Audio Aero, Electro, the small Lurne... maybe even a Linn. Some of these cdp's can work linked directly to the amp -- but you have a passive anyway, so no problem there.
I'd then look into cabling, PC's, and speaker (re)placement. Then, I'd *consider* upgrading the Mc...
Good luck!