Proxmox
I went from a server distro (ubuntu server i think) to Proxmox and it was a very nice upgrade. Leave the core system alone and put your "mess" in LXC containers and VMs. When you know what you want, set up a new one with the good config, and delete the old one whem you are confident you no longer need it.