>I've already broken both of them enough that I had to reinstall from scratch in the past (yes yes - it's supposed to be impossible I know)

Could you mention a bit about how they broke? I'm curious to see how that state looks, as from my perspective switching to a previous configuration seems to cover everything.