RE: OS 120 and 160
You can try a few things....
Try a smaller prop to get the max RPM somewhat higher. You'll then have to re-do the needles, and this may cure the difficulty.
Get more pressure to the tank, and you'll have to re-do the needles, too. This may work out because you'll have to lean the idle mixture to get a good idle with higher fuel tank pressure.