Assuming that your speaekers do everything you want them to do, always upgrade the source first IMO. I have recently tried new sources and was amazed at what I heard. Second the preamp to one that is more open with better details that lets the music flow out.
Happy Listening.
Happy Listening.