I feel like from all this, I should just not upgrade my system at all lol.
If I were to upgrade though, I would like to stick to Ryzen for now. Maybe the best bang for buck would be the 5800X3D with the same motherboard and same RAM, although since the 9000 series is dropping in July, I will...