Have now finally cracked it. As usual, posting unlocked the blockage.
OptO - 10d def is first 2 words, anag of last three (with a slight tweak). It is a type 2 adjustment, as you surmised.
Enjoyed that. Thought it was going to be straight forward as I sailed quickly through half the clues, but the other half took a fair amount of teasing out I thought.