Both of your proposed fixes are basically pipe dreams, as I suspect you know, BBOK, and I further suspect you’re not really interested in either one. Because what you really want is right here: “Sometimes I’d like to have gentle and slow ‘unadorned’ sex with an attentive partner who calls me by name, compliments me, and does things to my body he knows I enjoy.” (Emphasis mine.)
A: Unless this ball-less mess is climbing up the fire escape and slipping into your bedroom uninvited—which I’m guessing you would’ve mentioned—he keeps turning up in your bedroom because you keep inviting him. Stop that, DIB. Tell him you’re happy to keep seeing him, if you enjoy his company that much, but you’re not “seeing” him anymore, which means he’s not welcome in your bedroom. So there’s no need for him to bring up his fetish or any other sexual issues with you.