McHilt, I would seriously consider building your own comp.
You will save money that way and you will be future proof in pretty much every way.
Look around on retailer websites, see what you can use from your old comp for a start (especially the HDD and your current OS and maybe graphics card ) and get on the road to freedom from premanufactured-computer-ball-and-chain
.
What you basically need is a case, motherboard, cpu, memory and optical drive and "reuse" your current HDD and graphics card. You can build your own "semi-supercomp" that you can then later upgrade little by little as needed.