There's a world of difference between D/s and BDSM, which is ordinarily consensual, and non-con, which is what you have in your story and is what you warned for. I suppose that last scene implies a mild D/s relationship, and there is bondage, but you did warn for that. I don't think your warnings are inadequate.