Reminds me a good amount of pinktea's stuff. If I had to offer any improvements, I'd probably recommend taking a few other ideas from his stuff- so more punishment options, different varieties of sex and teasing them, more dialogue options, etc.
Oh yeah. Everything you mentioned will be in the game.