Larrykell, As to the preamp, there is, in my opinion, only one that I would consider, namely the Supratek Chenin tube preamp. This is a world class preamp that compares more than favorably to those costing $10,000 and more. It has a a phono by-pass also, if you want. If not, get the less expensive Chardoney model, the same preamp, but without the phono stage.
The Chenin goes for $2900 new, the Chardoney for $2100 new. Also, as to upgrading the speakers, why not try the Magneplanar 3.6's, a fabulous speaker for the money. You'll dance and dance your touche off.
waltchristensen