Sean, thanks very much for the comprehensive guidance. Unfortunately, I would not be able to send the engine to you as I am in the UK!
I am definitely staying away from the local Yam dealer given the BAD NEWS they were laying on. Instead, I'm going to have it looked over by a chap who comes...