I also once tried to create a map of s-risks here
I would add to your typology the s-risks of quantum immortality - an infinitely log timeline where a person is not dying from aging. Actually, I concluded now that such timeline will eventually end up in some form of AI resurrection, but such AI may be hostile.
Another type which should be mentioned is "hostile human augmentation", where neurons are rewired by hostile AI to make the victim feel even stronger and stronger pain. Which end up in tiling universe with anti-orgasmatronium.
Another distinction which should be mentioned is between a pure "pain s-risks" and s-risks where a person also have moral sufferings via understanding of her bad - and probably eternally worsening - situation (as in the story "I have no mouth but I must scream").