That seems to cover it. His article that started all this proposes a few solutions for HTLC-X problem too: V3 Transactions Review
That seems to cover it. His article that started all this proposes a few solutions for HTLC-X problem too: V3 Transactions Review