Well argued explainer article. Maybe you'd be interested in publishing it in Original Philosophy?
One the "Ship of Theseus" thought experiment, I think it is only a conundrum if we, as the Ancient Greeks did, hold a static view of identity. They saw unchangability as perfection, thus the idea that the Ship example provides that identity can coexist with change was baffling to them. I counter that identity is not connected to permanent traits, which explains away a number of philosophical systems. Personal identity is, as you point out, more complex. I gave some thought son this in an article awhile ago.