As it is a sail drive, replacement should be a relatively easy proposition. As it is a Volvo replacement is probably highly recommended.

A friend had a Volvo 2 cyl engine (possibly the same one as yours) in his Adams 31 (not a sail drive set up) that he grew to hate due to it's unreliability, outrageously expensive spare parts and lack of power.
He replaced it with a second hand marinised Kubota 3 cyl (heat exchanger cooling)that he is more than happy with. He bought it from Diecon Engineering in Brisbane at quite a reasonable price.
I had a Kubota 4 cyl in a previous yacht and I have to say they are a bullet proof engine. A 3 cyl unit say 20-25 hp would be an ideal engine for your yacht.
There are thousands of them around powering welding machines, lighting plants small tractors etc., so parts are plentiful and cheap.
Nanni Diesels are a marinised Kubota but I don't think their marinising is very well done.
Before you spend your dollars it would be worth your while enquiring with these two companies.
www.marinediesel.com.au/default.asp and
http://www.diecon.com.au/index.html I hope this is of help for you. Cheers.
Edit:- You may be able to get a Kubota that will bolt onto your existing sail drive. Like I said it is worth making the enquiry.