Here's a quote that House and Harman themselves diagrammed. From Much Ado...
"When I said that I would die a bachelor, I did not think I would live till I were married"
I will work on trying to post the solution here later.
I will not bother to quote House and Harman because you diagrammed it perfectly (with your "or" option). Incidentally, for those who have the book, it is on page 401.
H&H DOES place the "when" clause connection to the left of the "not" -- which I think is correct, but not that important.
I don't like it as much as the other, though I say it could work.
More importantly H&H did not see it that way.