For my boat I used French Marine for the Volvo engines - not the cheapest, but turned up when they said they would (at pretty short notice) and seem to have done a good job - no complaints from me.
There is also Mark Baudains at baudainsmarine@hotmail.com
though I haven't seen him around for 6 months or so, so I don't know whether he's still operating.