Hey,
Honestly If I were you, I would sell the pc and go for a completely new build, since you will have to replace all the components eventually you listed because you have a 5 years of no upgrade plan. Once you sell it, increase the budget to 100k - 120k, go for 13th gen or 7000 series...