Good luck (better luck) with your search, David and welcome to the club.
What you're going through is a royal PITA as you're finding out.
Jim
Welcome to the Club, David! Jim's advice convinced me not to even start down that road. On third thought, my engine is running just fine now and there is some benefit in getting the factory overhaul before some problem develops that turns the core into junk. I will have to start thinking hard about this.
Good luck with your search!