Replace the the HD5830 with a HD6850.
Mention the brand of the PSU.
Get a Quad core. Maybe the i5 760.
Yes i5 760 sounds like a really good idea, but im on a budget so can only change on of two. Graphics or CPU?