Thanks Roger, that is just fantastic information. I will send you a PM and we can work something out.
Thanks also to the offers from John and Neil for switches and bezels. I spoke to Borghi today and he has some squirreled away from various repairs and replacements, and I only need one, so that problem seems to be solved.
Now I am trying to decide what to do about the warning lights. Car Builder Solutions have some that look ok but they dont have all the symbols that I need however I could probably get some plain ones engraved. I have been trying to find some that have removeble bezels and lenses but so far not luck.