To upgrade, change RAM to 2x32GB 7200, switch m.2 to Two 2TB Gen 5 or what even you need. Drop motherboard to a B860 with a I7 265K ($310). GPU are once again overpriced mid and high end both I would stick with a 5080 and lower end drop to 4060 or 5060 with 16 Gb memory