I haven't used new systems in a while but it was always my conclusion that CPUs don't matter for general computing these days. The basic i5 is more than fast enough for those needs. When you get into specific job types (rendering/editing and such) then you might benefit. Gaming (in recent years) has always been GPU limited rather than CPU (IMO)
As for the OP, i'd go for the i5 and call it a day. My Core i3 is still chugging along nicely and all I did was put a SSD in there and it flies now as a result. Still I want to upgrade my laptop with a Haswell version and i'll prolly get a Core i5 this time for more demanding tasks that I plan on doing.