What speakers are you running? Have you measured and treated your room yet?
I'm in the same boat as you, I think. But I'm being pretty methodical about it, getting each stage in place (researched at best bang for buck).
Once I get the complete top to bottom system built (treatment down to electric), that's when I begin looking at greatly upgrading the source components, one at a time, slowly. The reason to not make any changes right now, for me is that I haven't truly heard the pieces in their fullest capacity until the complete system is done.