I think that is probably the best choice. Casiopea's reply seems to imply that too.
The "if" version does not come to my mind "naturally" (although I understand it when I hear it), because I am not a native speaker.