At Bernd's suggestion, I've put my uncorrected, unsubtracted W+ yield side-by-side with Justin's.  They are similar in shape, but far from identical, which shouldn't be the case, unless I've misunderstood what Justin is showing.

The next step will be to regenerate my data trees to ensure this isn't caused by mismatched productions.