Knowing the scale, they are probably gonna be released seperately as the r18 just adds 2-3 cgs per route for the spicy stuff
While the witch dlc will be rather complex due to adding new storylines and main story ends thus will be longer in production