I would say overall the 8350 is better than the i5, i5 mainly excels in gaming but not by much. This is because single thread performance is where Intel excels. Since you are doing everything I would recommend the 8350 as it just offers more bang for the money!
I want this build to be future proof tho
If you want it to be more future proof, I would go with the more cores --as software is beginning to use more and more cores, you will definitely benefit more from the 8350 in the near future.