To paint or not to paint?

My opinion is that you should fix what it absolutely needs right now, and then do all of the extras when you restore it.
It looks good now, resist the urge to get in too deep.