I think the six hours applied to the potions. It doesn't matter now that the genius witch is changing him with her magic. Also, since she is the one transforming him, I think it is her preference rather than his. Lastly in case you missed it #6 was komugi-chan with the original genius witch.