Congrats on making it up the waitlist! That, in and of itself, is a huge accomplishment! Would there be opportunities to work with your POI at the masters level, or would the EdM be a more general program? That is one factor to consider. Also, consider what type of jobs would be available to you as a counselor versus as a social worker.
I, too, applied to Counseling and to Social Work programs, and I am in the midst of making up my mind! My decision will depend heavily on which research opportunities are offered to me at the different programs.