Integrated or Amp/Preamp combo for Magnepan 1.7

Hi All - currently using a W4S 250W/channel integrated amp with fairly new Magnepan 1.7s and thinking I can do better. The sound is a bit bright and I'm wondering if a different integrated or amp/preamp combo would help. I've searched the forums and haven't found a lot of specifics. I'm considering, thanks to a fellow Agoner, something like an older Audio Research Pre or CJ pre with a solid state amp (Pass or others). I would prefer an integrated amp, but separates may be the way to go. Hegel, SimAudio or tube integrated are under consideration. I have a small square room ( roughly 11 x 11 ) and I mostly listen to classical, jazz and classic rock. Budget would be around $3000. Thanks for any suggestions.