Glad you are getting things figured out. it is fun tinkering for sure. Seems like your only question left is the oil out of the oil pump. I can't answer that as I took the oil pump off of mine, but I would say that if there is oil coming out then that is a good thing. Slight smoke tinge in the exhaust is what you are looking for, from what I have been finding out. Good job on your trouble shooting.