I had a Cyrus 1 (mkII) for a long time, and loved the power that came out that small, shoebox-sized (metal!!) case. It really had the speaker in a firm grip, delivering lots of detail, good soundstaging and firm bass. Eventually I bought new speakers (some kevlar-coned B&W's), and that was a bit to much. The natural replacement at that point was the Cyrus III, to which I listened but didn't like. With the III, Cyrus had a little dip, but according to the reviews, they're back. Great thing about the Cyrusses is the way you can upgrade them bij adding a PSX-power supply, or buying separate power amps.
As for Naim: the older gear has their own, to my ears oddball, sound. They're superfast, very rhytmic and very detailled, but also a bit forward and with no soundstaging. It seems that newer models have a more mor-sound, so maybe I'm judging to harsh, but I didn't like Naim. But if you got a chance: listen to it, it might be what you're looking for.