ide go for the I5-6400, while yes this will take some investment but its worth it, Skylake architecture is pretty damn good, pair that with a good H170 Motherboard and some decent DDR4 ram and you will not need to upgrade for quite sometime due to this all being new hardware.