I've thought about the tyres, and think that the best strategy is to wait until my current tyres wear out, then look at my best option for an upgrade.
I don't think it's worth replacing the rims until my current rims wear out. This is not meant to be my last ever bike, but something that I can...