I can't add anything to the technical debate - Wm. and Donnie have that covered - but I have to commnent that a used or rebuilt engine may be a good alternative to the pain of tearing this one down and putting it back together. Especially considering your comment that "it was sucking a good bit of oil."
Regarding injection timing - I have a 617 engine manual that is doing me no good. I am willing to put it on permanent loan to you if it would help.
Take the day off and enjoy the holiday!