replace cd player and computer speakers


Excellent Xindak player is beginning to mistrack. The music is rock(/collector item) oriented and it's a VERY small apartment.: say a digital source with small( powered ?)speakers
I'd like something that could also integrate a turntable for similar material on 45/lp 
theoriginalthor1
m 40 audio speakers (the old ones) have the amp inside. The volume control is noisy.
Vanatoo was good at nyc audio show as was the voxativ.I didn't notice room problems.
as for budget, i want the improvements in the source to be audible at a level to justify the increased cost.The room is small.i can't blast out the JBL pros or MBL's i will upgrade the tt ,also from an old technics sl 10 (which is also no longer viable; too much record intertrack noise/can't adjust the tracking above the alleged indicated1.5 gms)...........