Agree with advice
I agree with Steve. Only caveat I’d add is to wait to upgrade until you can afford to upgrade to electronic shifting. Of all the upgrades you might consider, the one you will likely appreciate the most is electronic shifting. Plus, once your bike is properly set-up, you’ll likely never (or almost never) have to adjust your shifting again. It is THAT good and that precise.
Good luck with your decision making.