Yes, Tw and Tr. They are not jumped together (Duh, as I see they are on the one I took off).
Control is Beckett GeniSys 120V Model 7505. Replacement for HW 7184P
Yessir, jumper on. And boiler has resumed its heating operations!
So, it looks like the core issue was control went.