I'd prefer that CNJ get the Banish and Scourge spells that THM has, and that THM gets all of the elemental magic that CNJ currently has. If THM is to be the BLM, it should be the elemental magic master, and as CNJ is to be WHM, Light and Dark magic makes a bit more sense for it.