Might be able to help on the headlight, Nick. Mate has recently brought a UK-spec Gen 1 over to Spain. Will need to swap headlights at some point ... I'll ask if he's interested in doing a deal.
He'll probably want to keep the clocks, though, as they accurately reflect the low mileage of his bike.
MIke