I think it's right that you at least said that you were uncomfortable and had some concerns. To say nothing would have been the same as asking him to call you Doormat, and that's no good.
Unfortunately, through my mom, I've seen parenting gone awry. There's a whole story that continues to this very afternoon that would take too long to relate, but I've come to believe that success will come when there's consistency and honesty and it sounds like you're on the path to building that with him. If I could give you a hug, I'd give you one, because I need it. I mean, you need it, too.
I'm just glad my sisters aren't at that sexual phase yet. Heaven help me!