I have tried the CC loop and it seems to work fine. I calculated R17 to be 400k. As a 470 k was already fitted I tried it temporarily with that. I'll have to do further testing and calibration and maybe add a calibration routine to the code, so I don't have to manually update the hard-coded calibration constants.
This project is taking shape, but lots of things to be done yet, including finishing the case, mounting the PCBs and adding more functionality to the code.
Juan