I like the Crane part#110692 cam, grind # H-238/3347-2s-6 with springs # 99846.
I'd loose the Air Gap and find a Dart single plane high rise.