I know someone who's about to sell his T40 with a 20hp sat on a trailer.
The boat and engine are still under warranty.
PM me your contact details and I'll pass them on.
I have no idea of cost etc as he's only just bought his new replacement arriving this coming weekend.
Location Southampton BTW.