Can I ask why there's a voltage divider following the adjustment pots and why the CC pot divider is reference to the return, not the 0V? The values seem quite high.
If you mean the divider after the CV pot in the simplified version? It's because the 8V control rail is being used as the reference.
I don't quite understand the 2nd question. That isn't really a divider after the CC pot, they are more so summing resistors.
Make R6, R7, R2, R3 all 10K. C6 and R17 aren't needed. 2mA is enough for the TL431.
U4 should return to GNDA.
The CV compensation should come from the ORing node.
EDIT:
R4 actually is too high because you are using a higher value CS resistor. What max current are you aiming for?