I like that. My wife is an editor of articles for academic journals, and she runs into that question of how to refer to organizations. She definitely always goes with “nonprofits who.”