Bad design.
Dungeon goes in the basement, not in the middle next to the cuddle puddle or the burlesque room. The noise and activity would throw off the vibe.
Really, it sort of depends on the type of energy you’re going for, but I’d make that dungeon room the massage parlor/tarot card reading/high tea service room. Foyer gets a boot shine station.
Hair and makeup moves to the polycule room, which is lined with mirrors and outside the gender swap machine.
Pet play moves to the current massage parlor, which appears to be some sort of 3-seasons room - everyone knows that cats need sunlight. Current pet play room becomes vetting and administration, plus coat check.
Milking room and dungeon go to the basement, along with group showers, rigging, and the science lab (medical, vacuum beds, electrostim) and other wet or high noise equipment. No carpet. Tile. That way you can hose it out.
Poly play room, group sex, and individual suites are upstairs. Each room has ‘flipper’ signs indicating status - reserved, observers welcome, participants welcome, do not disturb, in need of cleaning. Upstairs bathroom has a compact dishwasher under the sink that’s capable of sterilizing. Pantry has a lending library of sorts.
Editing to add: what’s currently the milking room becomes my office, where I shitpost to the Fediverse.

