Yes. OP_Evict is a way to fix that problem, by making the HTLC preimage branch of the HTLC invalid once the timeout has been reached.

Traditionally we've been dubious about making it possible for transactions to become invalid in the future. But in the post I argue that it is acceptable if we treat them similar to coinbase outputs, preventing outputs that may expire from being spent until they're 100 blocks deep.