I've gone back to using the 3E Outsider to handle anything that isn't elemental, fiend or directly celestial. That covers ethereal, astral, slaad from limbo, modrons from Nirvana, etc. Subtypes can be used to differientiate what plane they are from. So, for example a Blue Slaad would be...