Hypothetically, is your goal to understand personality, or to fit people into categories? They're different. If you did want to build a cogent theory of personality, why not start with the building blocks and move your way up? To me that would be the most efficient way.
Let's give it a try, shall we? I would prefer a model that can account for the full range of personality traits, including disorders and typological functions. Here's how I would set it up. This is tentative and kinda off the top of my head, so criticize and elaborate away.
Divide personality into 2 fields: content and management.
I. Content: All the stuff that filters into your experience. Includes:
_ A. Sensory input from the 5 senses (sight, sound, taste, touch/pain, smell)
_ _ 1. Feelings: Maybe controversial, but I think feelings are actually physical changes in the body, as tension or relaxation (touch/pain sensation). They break down into two categories:
_ _ _ i. Pleasant (comfort)
_ _ _ ii. Unpleasant (discomfort)
_ _ _ Note: Feelings can also get triggered by mirroring another person, which is essentially sensory input, but a special class because it's more direct and immediate
_ B. Thoughts, which are basically associative, based on current Content
_ _ 1. Unconscious: automatic thoughts and associations
_ _ _ i. From memory: comes in the form of the 5 senses
_ _ _ ii. Needs and fears: Images like an attractive person or tasty food or a wild bear that trigger Management (below). Can be either innate or learned and have varying levels of power.
_ _ 2. Conscious: Hypothetical/analytical mind-stuff that you generate on purpose
_ _ _ i. Auditory/Semantic
_ _ _ _ a. Auditory: the sound of a car alarm
_ _ _ _ b. Semantic: most thinking falls into this category; occurs in strings of words
_ _ _ ii. Visual/Spatial
_ _ _ _ a. Visual
_ _ _ _ _ _ (a) Hypothetical
_ _ _ _ _ _ _ (1) Impersonal: unicorn, the Dalai Lama's brother
_ _ _ _ _ _ _ (2) Personal: Imaging yourself losing and being sad, or winning and being happy
_ _ _ _ _ _ (b) From memory
_ _ _ _ b. Spatial: concerns the relationships between things
Note on moods: Thoughts are constantly triggering other thoughts as well as feelings. Certain thoughts and certain sensory input will trigger lingering thoughts and feelings. The combination of thought and feeling can be called a mood, but I wouldn't give it a separate category. Moods, however, do break down into different components:
_ _ 1. Anger - thoughts: conquer, subordinate, or hurt competitors; feelings: pleasant tightness around the chest area
_ _ 2. Fear - thoughts: loss, self-subordination; feelings: unpleasant tightness in the back and chest, sometimes stomach
_ _ 3. Apathy - thoughts: pointlessness; feelings: [have to think about this one]
_ _ 4. Sadness
_ _ 5. Excitement/Restlessness
_ _ 6. Happiness
_ _ 7. Intimacy
_ _ 8. Beauty/Joy
_ _ 9. Care
II. Management: Content triggers Management "programs" that motivate the organism. The purpose of Management is to modify or retain certain Content. You could generally think of it as resistance or maybe preference. It's the problem solver. In this personality model, Management can be thought of a the Motive component of personality. Motives are triggered by
_ C. Motive
_ _ 1. Modify
_ _ _ i. "Pursue" or acquire
_ _ _ _ a. Compete
_ _ _ ii. "Avoid"
_ _ 2. Retain
I have to think about this more and need a little break.