I think of kink as more of a bedroom thing, and bdsm as more of a lifestyle thing, but I don't know if this is standard usage.