Another vote for the i7 3770 route. It will give 4 extra threads, slight increase in IPC and those two combined, will allow for a better gaming experience.
You can offset some of the 3770 cost by selling your 2500. In the end that will extend your rig's life.
Spend your extra cash on a better GPU instead. Ebay has several used GPUs that are much faster than what u have if u don't want to pay Miners edition prices.