Counterpoint upgrade or Virtue Audio?

After years of traveling I am back "home" and dusting off my audio equipment. I have Aerial 10T speakers, a Counterpoint Solid 2 power amp, a Counterpoint SA-2000 pre-amp and a California Audio Labs CL-5 CD player. As you can probably guess this system was put together in the early 90s and I'm ready to refresh it. I am keeping the speakers since they do a good job. I am wondering what to do with the rest of the stuff? On the amps, I am considering getting the Counterpoint gear upgraded (if Mr Elliott is still doing upgrades), or picking up some other amplification. I have been intrigued by the Virtue Audio amps and like their small size (vs the 80 lb Solid 2!).

I would appreciate the forum's wisdom on how to proceed and open to any ideas.