Upgrading - what amp to choose


I'm in the process of looking at upgrading my NAIM 5i - i.e. the one with the jack on the front panel and the passive front end.

I like integrated amps (they take up less space) and I specifically like the NAIM because it runs so cool.

But I'm looking for something that resolves to a higher level with better imaging, but has the punch and clarity of the NAIM.

Budget around $3k

Any thoughts?

Or is my only choice the NAIT XS-2 :-)

Cheers :-)
williewonka
@WillieW - The outboard PS also makes a huge difference on the CD players. You wouldn't believe it. I think every designer would probably want to put a big PS in a separate box, but the marketplace won't tolerate it. Peter Qvartrup from Audio Note was telling me about the pushback he got about separate power supplies in the Asian market, where space is extremely limited. Anyway, enjoy your demo and good luck.
May I offer a different, used option? If you can find a MF KW500 in good condition, it may surprise you. Tremendous amp. I used it with Sophias. Used should be around 3k. I've had mine for 11 years and recently upgraded to NuVista 800, which is phenomenal. But I'm not selling my KW. It's too good. Saving it for a second system. Good luck!
Perhaps you should get a good tube integrated if "finesse and imaging" are actually important…more heat maybe (I say "maybe" because I've had some SS amps that could fry an egg) but really not an issue unless you live in a small hut, not that there's anything wrong with hut dwelling (Yurts? Domes? Treehouses?). When SS amp hype says "tube-like" I look at that as tube encouragement…at 3 grand there's some nice stuff with enough watts to get the walls (or tent flaps) shaking like that new Prima Luna thing that can use various tubes in different modes. Besides, tube amps are more fun.
I'm go also with the pass,stretch little to get better .
Are you looking only SS or willing to try tube?