One option might be to have two versions of the HTLCClaimB txs:
- one signed with ACP|SINGLE, but with nSequence = delay so that the honest party can claim revoked outputs
- one signed with SIGHASH_ALL and no delay, which creates an ephemeral anchor output and prevents pinning
Doubles the number of HTLC signatures you need to do, though, which sucks.