Ok, so, what are you saying? These two, ‘males’, should be referred to as Warlocks? I am confused...
No,no, no. In order to be a ‘Warlock’, you first need to be male. Witch works better here, and it is, after all, their description of themselves.