Your analogue source components are far out classed by your amp and speakers, and I don't think upgrading any of them is a good use of funds.
Do you have a budget to improve your front end?
Are you committed to vinyl? I ask because my digital source rivals my vinyl source at about 1/4 the cost.