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 :-)