The comparator effectively has infinite gain, so the current feedback loop is bound to be unstable.
The cleanest way to implement both average voltage and average current feedback is to give each their own error amplifier with its own compensation network, then feed the lesser of the two to the PWM modulator. This isn't really practical to hack onto an existing PWM controller like the LT1307B.