Sort of both of them....
You need the i5, much better than an i3
the cheaper motherboard will perform the same as the expensive one, so stick with the h110
you need dual channel RAM, so get a 2x4GB kit of RAM (or even better, 2x8Gb kit)
have a look at the toms hardware PSU tier list to find a better power supply - tier 3 should be fine.
Consider an SSD as well as the HDD - makes a huge speed improvement