Sounds like you're already taken care of but, as a thought, if you can only keep the motor running with the choke partially closed that makes me...
You shouldn't have to rebuild the motor simply because it's leaking. As long as it has good compresion and runs well there isn't any need to do...
Separate names with a comma.