Replace the chain and it should be good.
IF the cassette skips, replace it too.

I disagree about putting the old chain on and riding until???
Why put excessive wear on the chain rings.

ALL the upgrades you list are a lot of money for something that you'll probably only notice in you head. (because you have to after spending all that money)
You already have "pretty good stuff"!