Seems like a great example of where clock-phase instead of clock-pulses could solve a lot of gnarly problems with detection logic and so on. Much simpler. We talked about it here:
In thinking about it again, I would propose the phase-signal to be a saw-wave, so sharp leading edge (falling ramp) because you would get the trigger signal from the leading edge for free.