I'd suggest going with amp/preamp first. I only say this because it is good to see what the source you currently have can sound like. It's hard to judge sources with bad preamplification/amplification. Get amplification/preamplification that matches your speakers.
KF
KF