ENFP 8W7

Was debating if I had made an error with my Enneagram, but after thinking about it- its actually not wrong. Seeing as I want to become a criminal psychologist and actually have to advocate, and persistently work to try and see what can be done to societies outcasts (rehabilitation if at all possible), im definitely seeing this as the one for me. MAYBE theres a chance that im ENTP instead? But never got that result. Feel free to share your input!