I agree with Jarno comments. If MP3's will be your primary format for critical listening then migrate to Squeezebox with a "Killer" DAC. But if you are starting to fall in love with LPs start looking at some of the reasable tube components.
Wharfedales and NAD was my first system many, many years ago. I quickly moved up to Counter Point tube pre amp with Bryston 4B power amp. Really improved the Diamonds bass soundstage and imaging.
Great start,
pf