I'd go with an i5 and 7870XT, the XT is only a few bucks more than the 7870. The i5 is much stronger CPU than the Phenom II.
The Phenom II with 7950 would get you better framerates but for a long term upgrade I would go for an i5 and the best GPU you can afford with it.