So what did you think of being type 2 and 6? I guessed those because I see so many of the positive aspects of those traits in how you've handled your marriage. The negative side is that with being so loyal and giving you can end up feeling worn down and used. I don't think you need your H to give as much to you as you give to him which is ok to a certain extent. I think when it ends up so off balance is where you reach a breaking point. That's why standing up for yourself in reasonable small doses is so good for you and your H. It gets things back to a more balanced state.
I know people have seen some of your stances in the past as being too hard or extreme but that was the natural, unfortunate, part of swinging back from too much supplicating and giving. You are now on a better stance with seeing that you can hold your ground without being defensive or offensive.
I hope things continue to get better for you!!!
But what is happiness except the simple harmony between a man and the life he leads? ~Albert Camus