Adcom GFA 5802 Upgrade

I currently have 2 Adcom GFA 5802 amps which I had used to biamp a pair of Infinity Kappa 9 speakers I recently sold. While I'm very happy with their performance, I'm considering selling one of the Adcoms and look for an amp which would be a noticable upgrade in performance. I would like to spend between $1,500 and $2,000 and prefer a solid state amp. Initially the rest of system I would use the amp with is an Adcom GFP750 preamp, Logitech Touch/PS Audio Link III DAC, and Yamaha NS1000M speakers or KEF 104.2 speakers. In the near future, I plan to purchase a pair of Magnepan 1.7s and I would plan to use the new amp with the Magnepans. My musical tastes run from Tony Bennett to Diana Krall to classic rock. Any recommendations or experienced would be appreciated.