IMO, 12k gaming rig for a new platform may not be enough...suggest you stick with that intel rig and only upgrade procie, graphics and psu....btw can you give specs memory for your current rig?
if you would really like to migrate to AMD , suggest you sell the intel rig first and add it to your 12k at least you will have enough room to move budgetwise