However, if your dream system is Klipschorns and Mac, go for it. Don't waste money upgrading from a mid-fi preamp to an upper mid-fi preamp, and for heaven's sake, don't waste money on wire. Save that to the very end, when you have everything you want and have some extra cash to play with.
As it stands, sounds like you have a very nice system. Enjoy it.