I think your current typing is accurate. The only thing I would have had a problem with in the past is 4w5, but I see you went back to 4w3. You seem a lot more demonstrative, oriented towards your image, and "impressive" (I couldn't find the right word here) than 4w5. Especially for an so/sp INFP. I also remember you debating between NTP and NFP, but don't stress it. You're most definitely an NFP imo.
As to whether E or I, I can't say for sure. Functions wise, you seem more Fi-dom than Ne-dom. Perhaps a 3 wing and being social-dom could make you think you're more of an E? When it comes to general traits of the two, you seem more INFP in that sense too, but then again I guess any 4 would.
I think what you got now is solid though anyways.