There's already another series that uses witch to refer to males as well in the translation, and warlock in that series is a witch that loses their way and uses black magic.
Personally, I also view witch and warlock as separate and non-gendered terms too, but it's authors choice at the end of...