Oliver , have you thought of using shift's (RRC) across two byte's... Clear both byte's ,Set you low char at 1, then shift across according to you input number,the send to output ports.
Probably generates more code , but does reset every pass.