You already have a pretty good pre-amp and amp and they are not part of the $8000 budget, I assume.
My suggestion is to keep the pre-amp and amp and get a decent set of speakers and a music server that can rip and stream.
Leave the analog rig for a later upgrade.
enjoy your system and if you begin to feel that something is missing, then, start on the upgrade road.
enjoy what you have, find a nice set of speakers. Go digital for now until you are set on your system and then investigate analog later when you budget allows.
Under no circumstance would I suggest you sell everything and start from scratch. Start with what you already have and build from their based on your taste in music, what you feel is missing and could be better and most importantly, your budget.
just my thoughts,
enjoy