Thanks, all. I tried swapping parts from a Fed1, but unfortunately they're all different sizes, so the collars won't fit and the rangefinder doesn't seem to like a swap of the glass.
Mark: sorry, I'm not sure I follow this - could you elaborate?
David - not sure I was disparaging ebay, although I've never had much luck with Leica kit there. It seems that the ratio of lemons to none-lemons is higher the more desirable the gear? And when the prices hit three figures I start to get twitchy - there's always more comfort factor in dealing with people who get recommended here...
But thanks for the suggestions - I'll give Newton Ellis a call, they look quite promising.