I love the quality of image and the precision feel of the ZM25 Biogon but the dual problems of getting it to invoke the more-appropriate 24mm frame in my M8 and then to hand coding it properly proved too daunting for me. I would NEVER mechanically alter the lens myself given my primitive metal-working skills. You may want to check with Zeiss directly about the availability of the ZM35 lens mount as a spare part. Any reputable photographic repair source in the USA should be able to fit the new mount, given Zeiss part and new Zeiss screws.
Also, Zeiss is rumored to be announcing a new distributor for the USA next month. That may also include an in-country, authorized repair capability which is sorely needed. The "send it to Zeiss in Germany" pencils out to be too expensive when shipping, insurance and customs costs are figured in not to mention not having the lens available for the month or more while its flying to and from Germany. (Yes, you are due U.S. Customs charges for the value of any service work done on the lens, even though you have previously registered the non-USA-made lens with Uncle Sam.)
At the end of the day, the reasons already stated and my increasing need to wear glasses while shooting pushed me over the edge on my own raging 25 or 28 debate. I've decided to make 28mm and not 25mm my standard wide angle lens for the M8. I can see the 28mm frame lines in the viewfinder when I wear glasses. And as a bonus, two of the several viable 28mm options for the M8 also give me faster speed than either the ZM25 or ZM28.
Sadly but necessarily, my ZM 25mm is being sold as I type this.
-g