What do you guys and gals recommend?
Kaby Lake - https://secure.newegg.com/WishList/PublicWishDetail.aspx?WishListNumber=36984807
Ryzen - https://secure.newegg.com/WishList/PublicWishDetail.aspx?WishListNumber=31593765
I'll need a new case but I currently have a GTX 960 and an ssd for boot with two HDD's for storage and running apps.
It really depends on what the PC will be used for.
I will be editing videos and gaming.
Both your builds are all over the place. I would get the i7 for sure. Better gaming performance not quite as good of editing performance depending on how large the files are. Add a SSD for your operating system and programs.
That GTX 960 is really going to struggle gaming with that monitor. I would replace that with nothing less than a GTX 1060 6GB card. Their a big difference in performance.
Also never buy a low quality power supply.
A good bit overkill on the power supply but good quality and will allow for a bunch of upgrades.