It's definitely worth trying to replace or clean the ICV. In my case, it wasn't very effective – maybe a slightly faster drop in rpm, but not the same effect as the new control unit.
But as Massi writes, he might have found an S1 based on the instrument layout, and it never had any problems with rev hang anyway.
