Two Tado systems muddled together

I have two properties with Tado systems and originally added one system to HA. At some point, when re-authenticating with Tado, I signed into the wrong account meaning the other Tado system was added to HA. I managed to force re-authentication with the correct system but the various entities of of the wrong system are left muddled with the entities of the correct system in HA.

I now want to add the second system to HA and have successfully done so by adding another ‘hub’ but the second system’s entities are still mixed into the first ‘hub’ as well as being in the second ‘hub’. Is there anyway to untangle this or should I just delete the ‘hub’ with the two mixed systems and recreate it? I assume this will break all of the automations based on the first system but I’ll be able to fix them?

Thanks in anticipation

I ended up biting the bullet and deleted the muddled ‘hub’. When I re-added it, all the automations worked without needed any changes so that worked as well as I’d dared hope!