I think you've taken exactly the right steps, honestly, so hopefully this take care of the problem.
I was going to suggest you reduce the cut out pressure by adjusting the pressure switch, good to know you've done this. Most applications don't require 155 PSI and this PSI preset, in my opinion, is way too high for a small oil-free unit.
Feel free to reply and let us know if this fixed the problem!
