Here is one approach: get the most out of what you have, then upgrade depending on the weakest link in your system, a different playback medium, etc.
By getting the most out of your system, I mean take care of the little things, manage vibrations, adress the power issue, use good cables. Exactly what you do about vibration, power, or cables depends on your budget. Keeps these enhancement items in line with your overall budget (20%). Look to AudiogoN for power chords and cables, look for quality wall recepticles, brass spikes, do the little things like keeping cables off the carpet, cleaning your records and routing cables away from one another.