The main difference between our systems is the graphics card. since your budget is less than 10k i suggest you invest in a good graphics card (and smps) while keeping your current cpu. You can upgrade it later when you have more funds saved up.
your 8k budget to change cpu+mobo+gpu will only get you a system with lower performance than your current one (even if you buy second-hand).
Go with Crazy_Eddy's recommendation and get a radeon 7850 or r7 265. You'll get great performance in games.
What smps are you currently using?