Well, I actually ended up replacing the entire engine with a Yanmar, but that was due to water ingress in the cylinders and seized pistons. Without cylinder liners, fixing that particular problem would have been a nightmare. The engine was a bit on the small side for my boat anyway, so...
On to...