WRT the Enya 4-stroke diesel.
I have a useful bit of experience with this engine.
Shims are provided for the head ... thus, the CR is fixed.
Find a prop with which the engine is comfortable; then just stick with that prop. Great little engine which absolutely will not stop running, so long as there is fuel available.
Here's my Enya diesel, flying an ARC Ready.