need help in a prebuild for gaming in budget

AoA i have about 25k pkr for a prebuild i need 16gb ram and something better then a i5-4590 maybe a 6-7th gen i5 or i7 whatever fits in the budget and please reply with location of the shop if you will suggest the pc if not then just the specs ,am4 is too expensive so i have to stick with intel ddr4 which is barely affordable lol ,i currently have a rx 470 with 600w psu so i just need a better pc therefore i am here to ask for your help and i live in sattelite town rawalpindi and going to islamabad isnt a problem but the problem is i have barely any clue about the best prebuild for gaming must be tower or bigger :p and 25k is the max budget i cant go higher,and yes i spent alot on the psu and gpu and forgot about headroom for processor upgrades 😂