I voted the bottom option, which is almost the same as the first imo.
Current d3cl rules but allow warcry vs dh
Edit: I forgot about ptr dr being bugged, no need to allow warcry again i guess. Count me +1 for option 1, stick with current test league rules.