But I agree, go with a better GPU, I second the 5850 or similar.
Personally I think an i7 is the way to go on the CPU. Do you have a Micro Center near you? They were selling the i7 930 (~290 on NewEgg) for $199. You can then get an open box ASUS P6X58D-E for like $180.