Nicely argued...
Thanks for a rational and informative post.
I'd add one observation, though:
Double planets excluded: Only the most massive object in a group of objects sharing an orbit around the Sun will be classified as a planet, the rest will be considered moons or satellites.
You'll need something to explicitly cover Trojan asteroids. These are clearly co-orbiting yet are neither moons nor satellites.
After that, you may also need something to cover captured bodies in non-conventional orbits like that wierd horse-shoe orbiting NEO...
