Handeling the genjutsu teacher should be easy enough, since she will just have Momo-chan as student :D. 

Demon, it's like Jangel said. If you need help or idea's for teaching either fuinjutsu or kenjutsu, just ask. And kenjutsu is indeed teaching the art of the sword, but don't just see it as teaching on how to swing a sword. But there is alot more around it like footwork, balance, the mental state, etc. Especially if you think about teaching somethings about bushido (way of the warrior) aswell.