Yeah Sky, you summarized it pretty well.
Also, Palmer's descriptions are excellent:
Enneagram Type 1s, Perfectionists, have a grounded, bodily presence. They are perfectionistic and controlled. The superego, or the values learned and internalized throughout life, runs the show. This type has a strong need to do the right thing without compromise. They have high moral standards and principles, and are hard workers.
There can be an undercurrent of frustration and resentment, and Ones can be highly critical of themselves and others. Usually Ones don’t realize the extent of their anger and resentment, although others are usually aware of it. Ones tend to hide their anger behind “shoulds": “You should do that because it’s right,” “You shouldn’t do that because it’s wrong.”
Enneagram type 6s are the troubleshooters of the enneagram. As members of the thinking triad, they are the most out of touch with the quiet, higher thinking center and their own inner guidance. Their minds spin out of control, on future possibilities, usually imagining the worst. As a result, they are anxious and wary of their surroundings. Physically, there can be a palpable anxiety to them, and many have a wide-eyed, surprised look.
Based on this, you don't seem like a 6, but 1 makes sense.