FWIW, I actually initially identified as 4w3, as my core type, and have since moved from that through a few other ideas to 6w7-2w3-9w1. I had some of the same thoughts as you, which was that I "feel" like a 4 in many ways. Artistic, aesthetic, individualist, moody, angsty. But as far as I can tell, you are very similar to me in that you do not see in the same way a 4 does even though you share a lot of 4 "content".
In terms of individuality, I think that's common to 7s in general. Most seem to have a good grip on being themselves and enjoying it. And certainly all NFPs share the internal focus on defining and expressing who they are via choice, both internal and external. Also w6 will give you a little reactive/defensive quality, so note that if you're fighting to be perceived fairly and correctly, that would be a very w6ish sort of behavior.
From everything you've described thus far, your fixes sound accurate.
@Chanaynay do you feel like taking pleasure in unfavorable work is a w3 thing? I would have thought it was more of a w1 thing, like being the most ethical person and taking one for the team. You're right about the "beauty" phrasing but I have to admit that while I see doing thankless work as a lovely gesture, I don't know how often I'd be willing to really actually do it. Maybe if I was feeling extra charitable or if I could persuade a friend to help me. And then I'd still probably tell people about it because I'd desire recognition. That's selfish of me, but I guess at least I'm honest about it?