When the more logical approach is to simply turn the generic masculine into the generic it’s being used as anyway.
That’s still causing the issue of “man as the default,” now it’s just “we consider women men too.” The more logical way would be to use language akin to “firefighter,” “officer,” or “pig,” all naturally neutral words.