I run a similar kind of setup, Unraid for storage + containers plus a separate Proxmox host to handle VMs (I agree, Unraid's VM manager sucks). If you're happy with how things are performing, I'd say leave it as-is. I've done the "everything on Proxmox" approach in the past (Gaming VM, NAS, Containers, VMs, etc.) and, while nice, it is more fragile since all your eggs are in one proverbial basket. Personally, I like the way Unraid handles NAS and container duties, while I prefer Proxmox as a VM host which is why I have them seperated the way they are.
A 10600t platform is probably sipping power and if you aren't running out of resources on it, not much point in consolidating IMO. Plus another thing to consider if that on the 5950x you'll loose hardware transcoding support, although maybe you've already sorted that out? Can your current MB support all your SATA drives as well?
If you've moved all your gaming needs to the VM I would ditch the gaming PC though, if you aren't using it not much point in keeping it around unless you want to add it to the lab.
TL;DR I'd ditch the SFF PC if you aren't using it, but otherwise leave things as they are unless you just want to try experimenting with a different setup.