Amp for Naim line?

I am trying to upgrade my amp Naim NAC250 for component which would match my other Naim top notch gear CDS2/XPS/NAC82/SUPERCAP modified by Whest and Tannoy TD12.Please advice.Oh and I know that I should be able to use non Naim amp to Naim preamp unlike viceversa.