The T40 is a great outfit Dennis.
I recall going round Mull with Highland Haggis and his mate. He had a 20HP EFI tohatsu 4 stroke on his and two up.. his outfit was faster than me in my Quicksilver one up and my 25HP 2 stroke.
I know you like two strokes but are you aware the Yamaha 25HP EFI 4 stroke is only 3kg heavier, Goes just as fast as the old two 25hp stroke..uses almost 1/3rd less fuel on long trips.. does the same cruising speed of 16knots at a third of the throttle while the two stroke was reving its guts out at two thirds its throttle ..so very much noisier. The two stroke fumigated folks following me on SIB outings.
The only advantage of the two stroke was it accelerated a bit faster..but as I never open the throttle full it meant nothing to me as Im not a racer.
Servicing ? Well I have had the 25HP EFI three seasons now and still only change oil, spark plugs and impeller plus an oil filter .. so..so far little difference
Im sure you will recall telling me to get a drone as they were great things. I always resisted as I didn't believe you ..but eventually I got one..and I admit .. you were correct..it is a great thing.
Why am I mentioning this ?
Well if you got yourself a decent EFI fourstroke to replace that heavy old two stroke..you might change your mind too. You need a trailer for that outfit .. so it doesn't have the advantage of a 15HP or smaller two stroke ..
only my thoughts based on my experience though ..so take it with a wee dram of two stroke oil if you wish