OK - I've thrown together a list of options.

1. i7 cpu/mobo/8gb memory, no video upgrade ($550?)
2. AMD 6 core/mobo/8gb memory, new video card ($600)
3. New video card, new CPU chiller - overclock the shit out of it (Cheap)

I'm tempted to try #3 first.