I recently scrapped it all and picked up a Peachtree Nova 300 integrated. I was floored by the sound quality and realized that I had come full circle back to the warm sound of the 70's and my Sansui 1000S and JBL's.
All in one neat, sweet and powerful unit running off my laptop into its many YSV inputs. It has preamp out so you can take advantage of its outstanding DAC and front end and use any amp you like with great results. Truth us you probably wont want to after hearing it.
This old gearhead is convinced that the future is in integrated amps.
IMHO