The best compromise for neutrality and efficiency is to keep gender neutral stalls but also retain an area with urinals which will be much quicker for large numbers of men to pass through then using stalls, and also saves water.

The other consideration would be that the stalls will need to be sufficiently screened that people in them don’t feel overlooked or vulnerable (I’m looking at you USA with your weird gappy stall building!).