My 1-2 shift can be notchy at times, especially when the oil is really hot.

I reckon the 2-1 shift is a case of remembering the noticeable jump between 1st and 2nd, and either slowing down a bit more before downshifting, or giving the engine a bigger rev!