I wonder whether linguists and others will gradually adopt calling them noun classes instead of genders.

I hope so. It would also help when explaining the grammar of a few languages to laypeople. Such as the Bantu ones - people treat their noun classes as if they were something completely alien, even when they speak a language with M/F noun classes.