Personally i'd wait for Ryzen, but what u need really depends. If you multitask alot in the computer a i5 is a must otherwise a g4400 is the king of performance today, it has near identical practical performance compared to an i3 6100 while being half the price. i5 3750k is my recommendation amongst what you linked however. you dont need an i7, and multitasking is weakness of an i3/pentium. Also you can find really cheap motherboards for 3rd gen cpu, try to get an Asus if u could, they do last longer in my experience.
edit: Yea, i assumed g4560 was just the "kaby lake" upgrade of the g4400, tests i looked up was the mix of both of them. Apparently g4560 has hyperthreading enabled which g4400 did not have. Which means g4560 literally is a kaby lake i3 with less clock and worse hd graphics. 60$ gpu to first real upgrade is to that costs 200$, its a budget performer's dream.