I have read here that May Chang EO (Litsea Cubeba) will help anchor citrus scents in CP.
I have also read that keeping your CP soap from gelling will help keep EOs scent in soap.....a way to do this is to NOT insulate and pop into the fridge. Have a read of this recent topic:-