I think this is a great way to think about s-risks. One risk factor I am not sure was included was the dynamic of decoupling well-being from survivability. I write a bit about this here.

Essentially, I think a generic risk factor for s-risks includes any action, such as genetic engineering, that increases the ability for organisms to survive and reproduce regardless of their subjective experience.