Gonna be used for mainly gaming and very minor video editting.
Also should I go for the rx 480 8gb or gtx 1060 6gb?

Also yes, I know I can save up more for a 6500 or 6600k or even wait for zen but these are the options I'm going with so if possible stay on topic please

Already got a 1151 mobo (not looking to overclock)

i5
and either gpu is fine

i5 cause the performance is gonna be much better and worth the price, real cores > extra threads

I5, either GPU is fine.
If u have a freesync monitor get the 480