This circuit worked as expected, but the changes mentioned in flip flop validation needed to be made. The schematic (mostly just hierarchical blocks) and pcb are shown below.

The validation board worked up to ~32kHz after which the output pwm became distorted and missed pulses. Scope captures below with the maximum and typical operating frequency.