In previous times, there were quite a few Buhk conversions to Yanmars. My 31 footer had a 3 cylinder Buhk and was converted (before my time) to a Yanmar 3GMD/20. Fitted well, slightly less weight. Not everything is as easy to access though.
Checkout a Yanmar 1GM10, still available new, and some pop up every now and then second hand. The Yanmars come with sail drives, but probably doesn't fit to the Bukh unit.
www.yanmar.com/marine/product/engines/1gm10/What are the symptoms of the propulsion problem?