It sounds like you're already doing a very large maintenance, you might as well pull the motor and resolve this and other engine-out maintenance items. I think dropping the oil pan with the motor still installed is just as much or more labor than motor pull.