The question in the title: Lurking for two months before posting: was that the right call? I will give what I have already checked below so nobody repeats it.
Checking my reasoning rather than asking for a conclusion.
My current understanding is set out below in the order I arrived at it. I think the second step is the weakest part and I would like that examined before the rest.