Hey [MENTION=16139]Honor[/MENTION], I'd be glad to help! Enneagram is much more my language, and I so appreciated your help with my MBTI typing.
In my opinion, integration and disintegration is sometimes what clarifies core type for people with a heavy wing (which is sounds like you might have). Here's a brief overview of the differences:
Core type 1 integrates to 7 in health and disintegrates to 4 in unhealth. A healthy 1 will be able to let down some of their rigid/legalistic tendencies and find the freedom to
experience the world around them without always feeling the need to press their ideals on others. An unhealthy 1 who is disintegrating to 4 allows the rigid emotional control of an average one to completely snap, becoming emotionally dramatic and wistful for what they see as forbidden desires. Unhealthy 1's usually feel shame about this, and discipline themselves again, creating a back and forth cycle between fantasy world and moral world. This is why 1 is one of the types most prone to depression.
Core type 2 integrates to 4 in health, and disintegrates to 8 in unhealth. A healthy 2 integrating to 4 allows themselves to freely express their feelings, instead of holding them back for the sake of others as an average 2 would do. They can recognize their own desires, and learn to take care of themselves before they can truly help others. An unhealthy 2 disintegrating to 8 stems a bit from their long time passive aggression, as the blow up "enough" point. It's the turning point from average 2's image as selflessly kind, to very direct and aggressive demands that they have in some way been wronged. It's said of disintegrating 2's that there is "an iron fist beneath the velvet glove".
Can you discern which is most true to your darker, and healthier seasons of life? The interesting thing (which I actually realized a couple of weeks ago) is that 1w2 and 2w1 (if you consider core and wing) will both see 4ish behaviour in health
and unhealth...which is quite a conundrum! That said, I'd say focus on how true integration to 7, or disintegration to 8 feels to you (because we know you have a 4 aspect either way).