The i5 is a capable chip, and upgrading the video card will make a very noticeable difference. Both are good contenders, but, as gillhooley pointed out, the lower power draw of the 1060 is something to consider.
Do you know the details on your power supply? Some prebuilts come with particularly weak PSUs.