pce: Ensure we always choose HCD's before ISO,PCE in zip files