I have another thread on a related topic but approaching it from a different angle. I posted a thankyou there and tried to copy it here but the forum won’t allow me to post another reply with the same content.
Here is a link to it but TL:DR, I took the nuclear option and rebuilt everything. Seems to be all ok now.