Here’s what I’m thinking, to keep it simple.
I’ll go with the original proposal. Keep the 5 (and last 9 in CW) and only replace the second digit.
If you want to give 22 or 33 (which I often do, but it’s obviously not a broad convention) then you type the whole thing.