as a swahili speaker I'd say that the beauty of swahili is that it's commonplace to butcher these noun classes unless you're from Tanzania. Kenyans, Congolese, Ugandas do it all the time