Time to upgrade - need advice

Where do you ultimately want to end up? It's not worth the investment if these are only stop-gap solutions.

Do you want to have either of these pieces two years from now?

If not, save a little more cabbage and make the move when you can get a piece that will fit in with your long-term goals... Just my two cents.

What speakers are you using? Amp and speakers is
very important.I have learned that the amp, should
be able to drive and match your speaker nicely, and
without a sweat, I did the pre and cd upgrade before
the amp, I did not get the result I am looking for,
until I replaced the amp.Why dont you try to audition
cdp, and, pre and amp one at a time?This is a lot
of work, but thats the way to do it.

My speakers are B&W N804 & ASW800.