MSI Z87I or Gigabyte Z87N-WiFi

Which would be better? I plan on overclocking my CPU, gaming, and some light video editing.

Flip a coin. Both are very good, and neither is a bad choice. I personally like MSI better than Gigabyte, but I have never had a gigabyte product. I had a MSI GTX 550 ti that still runs amazingly.