Hhmmm, good find on the drain tube - I need to check mine as the culprit for water getting in. Mud daubers around here plug up every round opening they find with nests. I found probably a half dozen when I bought my YJ a few months ago, including one on top of the passenger sun visor.
Yesterday I finshed cleaning surface rust off the steering pump bracket and accelerator linkage and got the bracket painted. Had to let the Ospho on the linkage dry some more. And pulled the valve cover off to replace a weeping gasket "while I'm in there" R&R'ing the manifold gaskets. I couldn't believe how much the valve cover bolts were torqued - No wonder the cork was squeezed down to about the thickness of a business card.
Soon as the fog and clouds blow out of here so it warms up a little, I'll get out to the shop and create more progress to post up about. I don't want to spray even rattle can paint until it gets above 60F. Up to a whopping 56F at 1100, so far.