Keep my i5 or uprage to i7?

I'd say just keep the same CPU that you have. Your rig is pretty good so there really isn't any need for a BETTER CPU. I mean, if you want extra speed then go for it but it isn't really necessary.