As for now, if you haven't overclocked your stuff yet. And your temperatures are fairly low (~60C on CPU, and about 69C GPU on full load. Lower than 80 anyway.), Then you could consider overclocking both.
That would at least squeeze a bit more juice out of them, while you're waiting for an actual
need of upgrading.
Don't forget to have a underclocked GPU, as long as you're not using it - by the way.
