It seems you do use the naive form, the one that is susceptible to the American Call Option problem I pointed out about.
This is fine for an initial implementation when you have no serious activity yet, but note that you should at least think of how to upgrade to a later mechanism that is safe against the American Call Option problem.
So all you need now is to ensure some kind of upgrade mechanism that lets you switch to using Barrier Escrows later and deprecate the current mechanism.
This is some early feedback from a potential auditor for OmniBOLT: