I have the same problem, I have replaced the return pipe, but again getting the smell of diesel, and the return pipe is moist with diesel, and puddles around injectors.
This is most noticeable after long run.
Did you sort your problem?
What was it, or any other suggestions... please.
Thank...