Tim, I am still interested in doing the swap if you are. I am not available for the next week or so, but after that I will be fairly flexible. It's a long way to come, so I want to be sure that we have all the details agreed beforehand.
How are you getting on with the mast? I didn't know Roger still had the original, but yours may be repairable, especially if the only damage is at the foot.
I'm not sure what gaff jaws you have. Mine has a saddle, which I think is standard. If you sent me a pic it got lost in the junk mail. The saddle may not be the best setup for the high peak, but it has sufficient articulation to do the job.
Paul