Just want a couple of points of clarification:
1.) Are you trying to set up a cosmological model of the actual solar system (i.e., with "Mercury, Venus, Mars, Jupiter, Saturn, Uranus, Neptune, Pluto, X" as your planets?
2.) Per your point #1 - is "Jupiter" not REALLY a gas giant but actually...