You are most likely a type 9.
Taking wings into account, you seem to be a 9w1
Type 9 - 9
Type 1 - 8
Type 2 - 7.7
Type 8 - 2.7
Wing 9w1 - 13
Wing 1w9 - 12.5
Wing 1w2 - 11.9
Wing 2w1 - 11.7
Wing 9w8 - 10.4
Wing 2w3 - 8.2
Wing 8w9 - 7.2
Wing 8w7 - 3.7
Where 9 = "Peacemaker," 1 = "Reformer" ("perfectionists, responsible, fixated on improvement,") 2 = "Helper," and 8 =