Actually looking at the schematic one more time, seems that you should do completely opposite thing to what I recommended previously. IMO, the problem cause is how current limiting is made. Voltage and current control loops basically are independent of each other but are connected to the same power stage input. Wins the loop which have lower voltage on the output because of the V3 and V4. When CC loop wins (charging capacitors), CV loop output voltage shoots up to the max but don't affect output voltage yet because of the V3. Once current drops below the limit, CC loop releases the output, but as CV loop output is on the max at the moment, here you go - you have overshoot as CV loop cannot drop down voltage before V3 fast enough.