How to skip an if controller on JMeter if previous sample's response is changed to OK after failure?

I am running a JMeter beanshell sampler test, after which I have an if controller that should run if the last JMeter sample is ok.

I have this working, however, I have to ensure if the first test fails, it needs to be changed to a pass but does not continue to the if controller.

I have tried ticking the ignore status checkbox in the Response Assertion of the test and adding a BeanShell PostProcessor that changes the previous test response to OK. These are not options as it results in continuing to the if controller.

So: - if test passes continue to if controller - completed - if test fails, change to pass but skip if controller

Any suggestions on how I can accomplish this?

Thanks