I think you missed the real theme, which is death and resurrection, a recurring pattern throughout the book.
While Severian is groomed to be a torturer, for most of the book his job (and Severian repeatedly emphasizes that it's just a job) is that of executioner, and he later holds the position of lictor for around a month. While Severian often recounts the procedures practiced in the guild tower, it's not really torture that he is concerned about.
The themes of death and resurrection, however, are central to the plot, together with the water motif as a symbol of cleansing, from the moment Severian nearly drowns in the river (and is rescued by an undine) to the destruction of Urth.