Sure, your CDP and preamp aren't the first things you'd think of for a high end system, but you're really not as far behind as you make it seem. I would address the preamp before the CDP, for various reasons - both logistical and sonic - that I'll refrain from elaborating on here, because the main thing I want to say is:
Don't do anything else right now if you're getting new speakers in two weeks! Break the speakers in for at least 100 hours over a couple of weeks, maybe leaving the CD on repeat while you're away from the house. Then spend another couple of weeks auditioning and assessing the sound with the broken-in new speakers in place. Firstly, your ears need to adjust to the new sound. Secondly, if these are the speakers you'll be keeping for a while, then any other system changes you make subsequently will need to work with the sound of those speakers. Plus, if those speakers turn out to be significantly better than what they're replacing, they'll help you hear what's going on with your other gear by providing a 'clearer window' with which to audition and assess for upgrades, letting you make more intelligent and effective choices.
Be patient and change things one step at a time (as you say, your budget forces this anyway). The worst thing you can do for trying to travel a predictable, or at least understandable, path for upgrading is to change a bunch of stuff at once willy-nilly. Limit your variables and take your time, and you'll make more cost-effective decisions. Your new speakers are going to sound vastly different from your present speakers, a bigger overt difference than you'll get from changing any one piece of electronics or wires, so approach this 'grain' question afresh once you're comfortable with their sound (and yes, it could even turn out that your current speakers were a part of the problem).
Don't do anything else right now if you're getting new speakers in two weeks! Break the speakers in for at least 100 hours over a couple of weeks, maybe leaving the CD on repeat while you're away from the house. Then spend another couple of weeks auditioning and assessing the sound with the broken-in new speakers in place. Firstly, your ears need to adjust to the new sound. Secondly, if these are the speakers you'll be keeping for a while, then any other system changes you make subsequently will need to work with the sound of those speakers. Plus, if those speakers turn out to be significantly better than what they're replacing, they'll help you hear what's going on with your other gear by providing a 'clearer window' with which to audition and assess for upgrades, letting you make more intelligent and effective choices.
Be patient and change things one step at a time (as you say, your budget forces this anyway). The worst thing you can do for trying to travel a predictable, or at least understandable, path for upgrading is to change a bunch of stuff at once willy-nilly. Limit your variables and take your time, and you'll make more cost-effective decisions. Your new speakers are going to sound vastly different from your present speakers, a bigger overt difference than you'll get from changing any one piece of electronics or wires, so approach this 'grain' question afresh once you're comfortable with their sound (and yes, it could even turn out that your current speakers were a part of the problem).