Thanks for all your insights, everyone
I decided I won't be upgrading... until the chainring gets worn and needs replacing. In that case, I'd just replace the whole crankset with the Claris one.
Would an upgrade to compressionless brake housings make sense? I feel a bit of friction when using the rear brake lever; it's not as smooth as the front one.