Don't know your budget but here goes anyway.
Personally, I would look at replacing the preamp. I think this would give you the biggest change in overall sound on all sources and give you a lot more flexibility overall.
Personally, I would look at replacing the preamp. I think this would give you the biggest change in overall sound on all sources and give you a lot more flexibility overall.